From b178f9ecdd23c131178da7570b5de60750c42372 Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Fri, 28 Apr 2023 12:55:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BB=A3=E7=A0=81=E5=88=B02.0=E5=88=86?= =?UTF-8?q?=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCM-CORE/api/desc/storage/pcm-storage.api | 8 + adaptor/PCM-CORE/api/internal/types/types.go | 7 + adaptor/PCM-CORE/rpc/etc/pcmcore.yaml | 2 +- .../PCM-CEPH/rpc/ceph/pcm-ceph.pb.go | 196 +++++++++++++----- .../PCM-CEPH/rpc/cephclient/ceph.go | 1 + .../PCM-CEPH/rpc/pb/pcm-ceph.proto | 13 +- 6 files changed, 173 insertions(+), 54 deletions(-) diff --git a/adaptor/PCM-CORE/api/desc/storage/pcm-storage.api b/adaptor/PCM-CORE/api/desc/storage/pcm-storage.api index 62b2dd33..383a42c5 100644 --- a/adaptor/PCM-CORE/api/desc/storage/pcm-storage.api +++ b/adaptor/PCM-CORE/api/desc/storage/pcm-storage.api @@ -76,6 +76,7 @@ type( PerCenterComputerPowersResp{ TotalSize int32 `json:"totalSize" copier:"TotalSize"` PerCenterComputerPowers []PerCenterComputerPowers `json:"perCenterComputerPowers" copier:"PerCenterComputerPowers"` + AccOtJobInfo AccOtJobInfo `json:"accOtJobInfo" copier:"AccOtJobInfo"` Code int32 `json:"code,omitempty"` Msg string `json:"msg,omitempty"` ErrorMsg string `json:"ErrorMsg,omitempty"` @@ -87,6 +88,13 @@ type( JobCount int32 `json:"jobCount" copier:"JobCount"` CenterId string `json:"centerId" copier:"CenterId"` } + AccOtJobInfo{ + AccRunSec int32 `json:"accRunSec" copier:"AccRunSec"` + AccCardRunSec float32`json:"accCardRunSec" copier:"AccCardRunSec"` + AccOtJobNum int32 `json:"accOtJobNum" copier:"AccOtJobNum"` + } + + ) /******************screen computing power End*************************/ diff --git a/adaptor/PCM-CORE/api/internal/types/types.go b/adaptor/PCM-CORE/api/internal/types/types.go index 6dd77ef2..92aa28a3 100644 --- a/adaptor/PCM-CORE/api/internal/types/types.go +++ b/adaptor/PCM-CORE/api/internal/types/types.go @@ -1874,6 +1874,7 @@ type PerCenterComputerPowersReq struct { type PerCenterComputerPowersResp struct { TotalSize int32 `json:"totalSize" copier:"TotalSize"` PerCenterComputerPowers []PerCenterComputerPowers `json:"perCenterComputerPowers" copier:"PerCenterComputerPowers"` + AccOtJobInfo AccOtJobInfo `json:"accOtJobInfo" copier:"AccOtJobInfo"` Code int32 `json:"code,omitempty"` Msg string `json:"msg,omitempty"` ErrorMsg string `json:"ErrorMsg,omitempty"` @@ -1885,3 +1886,9 @@ type PerCenterComputerPowers struct { JobCount int32 `json:"jobCount" copier:"JobCount"` CenterId string `json:"centerId" copier:"CenterId"` } + +type AccOtJobInfo struct { + AccRunSec int32 `json:"accRunSec" copier:"AccRunSec"` + AccCardRunSec float32 `json:"accCardRunSec" copier:"AccCardRunSec"` + AccOtJobNum int32 `json:"accOtJobNum" copier:"AccOtJobNum"` +} diff --git a/adaptor/PCM-CORE/rpc/etc/pcmcore.yaml b/adaptor/PCM-CORE/rpc/etc/pcmcore.yaml index 5f1389af..7d0a1886 100644 --- a/adaptor/PCM-CORE/rpc/etc/pcmcore.yaml +++ b/adaptor/PCM-CORE/rpc/etc/pcmcore.yaml @@ -7,7 +7,7 @@ NacosConfig: - IpAddr: 10.101.15.7 Port: 8848 ClientConfig: - NamespaceId: test + NamespaceId: storage TimeoutMs: 5000 NotLoadCacheAtStart: true LogDir: diff --git a/adaptor/PCM-STORAGE/PCM-CEPH/rpc/ceph/pcm-ceph.pb.go b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/ceph/pcm-ceph.pb.go index 968b4120..304f86b7 100644 --- a/adaptor/PCM-STORAGE/PCM-CEPH/rpc/ceph/pcm-ceph.pb.go +++ b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/ceph/pcm-ceph.pb.go @@ -603,9 +603,10 @@ type PerCenterComputerPowersResp struct { TotalSize int32 `protobuf:"varint,1,opt,name=totalSize,proto3" json:"totalSize,omitempty"` // @gotags: copier:"TotalSize" PerCenterComputerPowers []*PerCenterComputerPowers `protobuf:"bytes,2,rep,name=perCenterComputerPowers,proto3" json:"perCenterComputerPowers,omitempty"` // @gotags: copier:"DailyComputerPowers" - Code int32 `protobuf:"varint,3,opt,name=code,proto3" json:"code,omitempty"` // @gotags: copier:"Code" - Msg string `protobuf:"bytes,4,opt,name=msg,proto3" json:"msg,omitempty"` // @gotags: copier:"Msg" - ErrorMsg string `protobuf:"bytes,5,opt,name=error_msg,json=errorMsg,proto3" json:"error_msg,omitempty"` // @gotags: copier:"ErrorMsg" + AccOtJobInfo *AccOtJobInfo `protobuf:"bytes,3,opt,name=accOtJobInfo,proto3" json:"accOtJobInfo,omitempty"` + Code int32 `protobuf:"varint,4,opt,name=code,proto3" json:"code,omitempty"` // @gotags: copier:"Code" + Msg string `protobuf:"bytes,5,opt,name=msg,proto3" json:"msg,omitempty"` // @gotags: copier:"Msg" + ErrorMsg string `protobuf:"bytes,6,opt,name=error_msg,json=errorMsg,proto3" json:"error_msg,omitempty"` // @gotags: copier:"ErrorMsg" } func (x *PerCenterComputerPowersResp) Reset() { @@ -654,6 +655,13 @@ func (x *PerCenterComputerPowersResp) GetPerCenterComputerPowers() []*PerCenterC return nil } +func (x *PerCenterComputerPowersResp) GetAccOtJobInfo() *AccOtJobInfo { + if x != nil { + return x.AccOtJobInfo + } + return nil +} + func (x *PerCenterComputerPowersResp) GetCode() int32 { if x != nil { return x.Code @@ -746,6 +754,69 @@ func (x *PerCenterComputerPowers) GetCenterId() string { return "" } +type AccOtJobInfo struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + AccRunSec int32 `protobuf:"varint,1,opt,name=accRunSec,proto3" json:"accRunSec,omitempty"` // @gotags: copier:"AccRunSec" + AccCardRunSec float32 `protobuf:"fixed32,2,opt,name=accCardRunSec,proto3" json:"accCardRunSec,omitempty"` // @gotags: copier:"AccCardRunSec" + AccOtJobNum int32 `protobuf:"varint,3,opt,name=accOtJobNum,proto3" json:"accOtJobNum,omitempty"` // @gotags: copier:"AccOtJobNum" +} + +func (x *AccOtJobInfo) Reset() { + *x = AccOtJobInfo{} + if protoimpl.UnsafeEnabled { + mi := &file_pcm_ceph_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *AccOtJobInfo) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AccOtJobInfo) ProtoMessage() {} + +func (x *AccOtJobInfo) ProtoReflect() protoreflect.Message { + mi := &file_pcm_ceph_proto_msgTypes[9] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use AccOtJobInfo.ProtoReflect.Descriptor instead. +func (*AccOtJobInfo) Descriptor() ([]byte, []int) { + return file_pcm_ceph_proto_rawDescGZIP(), []int{9} +} + +func (x *AccOtJobInfo) GetAccRunSec() int32 { + if x != nil { + return x.AccRunSec + } + return 0 +} + +func (x *AccOtJobInfo) GetAccCardRunSec() float32 { + if x != nil { + return x.AccCardRunSec + } + return 0 +} + +func (x *AccOtJobInfo) GetAccOtJobNum() int32 { + if x != nil { + return x.AccOtJobNum + } + return 0 +} + var File_pcm_ceph_proto protoreflect.FileDescriptor var file_pcm_ceph_proto_rawDesc = []byte{ @@ -833,7 +904,7 @@ var file_pcm_ceph_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x02, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x22, 0x1c, 0x0a, 0x1a, 0x50, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x73, 0x52, 0x65, - 0x71, 0x22, 0xdb, 0x01, 0x0a, 0x1b, 0x50, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, + 0x71, 0x22, 0x97, 0x02, 0x0a, 0x1b, 0x50, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x53, 0x69, 0x7a, 0x65, 0x12, @@ -842,39 +913,50 @@ var file_pcm_ceph_proto_rawDesc = []byte{ 0x32, 0x21, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x73, 0x52, 0x17, 0x70, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, - 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x73, 0x12, 0x12, 0x0a, 0x04, - 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, - 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, - 0x73, 0x67, 0x12, 0x1b, 0x0a, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x22, - 0x97, 0x01, 0x0a, 0x17, 0x50, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, - 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, - 0x65, 0x6e, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0a, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x63, - 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x02, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, - 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6a, 0x6f, 0x62, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x08, 0x6a, 0x6f, 0x62, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, - 0x08, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x49, 0x64, 0x32, 0x90, 0x02, 0x0a, 0x04, 0x43, 0x65, - 0x70, 0x68, 0x12, 0x48, 0x0a, 0x0d, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x53, 0x63, 0x72, - 0x65, 0x65, 0x6e, 0x12, 0x1a, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x53, - 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x1a, - 0x1b, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, - 0x67, 0x65, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x51, 0x0a, 0x10, - 0x64, 0x61, 0x69, 0x6c, 0x79, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, - 0x12, 0x1d, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x61, 0x69, 0x6c, - 0x79, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x1a, - 0x1e, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x61, 0x69, 0x6c, 0x79, - 0x50, 0x6f, 0x77, 0x65, 0x72, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x6b, 0x0a, 0x1c, 0x70, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, - 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x12, - 0x24, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x65, 0x72, 0x43, 0x65, - 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, - 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x25, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, - 0x2e, 0x50, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, - 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x42, 0x07, 0x5a, 0x05, - 0x2f, 0x63, 0x65, 0x70, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x73, 0x12, 0x3a, 0x0a, 0x0c, + 0x61, 0x63, 0x63, 0x4f, 0x74, 0x4a, 0x6f, 0x62, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x41, 0x63, + 0x63, 0x4f, 0x74, 0x4a, 0x6f, 0x62, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0c, 0x61, 0x63, 0x63, 0x4f, + 0x74, 0x4a, 0x6f, 0x62, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, + 0x6d, 0x73, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x1b, + 0x0a, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x22, 0x97, 0x01, 0x0a, 0x17, + 0x50, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, + 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x75, + 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0d, + 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x1a, 0x0a, + 0x08, 0x6a, 0x6f, 0x62, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x6a, 0x6f, 0x62, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x74, 0x0a, 0x0c, 0x41, 0x63, 0x63, 0x4f, 0x74, 0x4a, 0x6f, + 0x62, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x52, 0x75, 0x6e, 0x53, + 0x65, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, 0x63, 0x63, 0x52, 0x75, 0x6e, + 0x53, 0x65, 0x63, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x63, 0x63, 0x43, 0x61, 0x72, 0x64, 0x52, 0x75, + 0x6e, 0x53, 0x65, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0d, 0x61, 0x63, 0x63, 0x43, + 0x61, 0x72, 0x64, 0x52, 0x75, 0x6e, 0x53, 0x65, 0x63, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x63, 0x63, + 0x4f, 0x74, 0x4a, 0x6f, 0x62, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, + 0x61, 0x63, 0x63, 0x4f, 0x74, 0x4a, 0x6f, 0x62, 0x4e, 0x75, 0x6d, 0x32, 0x90, 0x02, 0x0a, 0x04, + 0x43, 0x65, 0x70, 0x68, 0x12, 0x48, 0x0a, 0x0d, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x53, + 0x63, 0x72, 0x65, 0x65, 0x6e, 0x12, 0x1a, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, + 0x2e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x52, 0x65, + 0x71, 0x1a, 0x1b, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x74, 0x6f, + 0x72, 0x61, 0x67, 0x65, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x51, + 0x0a, 0x10, 0x64, 0x61, 0x69, 0x6c, 0x79, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x53, 0x63, 0x72, 0x65, + 0x65, 0x6e, 0x12, 0x1d, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x61, + 0x69, 0x6c, 0x79, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x52, 0x65, + 0x71, 0x1a, 0x1e, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x61, 0x69, + 0x6c, 0x79, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x6b, 0x0a, 0x1c, 0x70, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, + 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x53, 0x63, 0x72, 0x65, 0x65, + 0x6e, 0x12, 0x24, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x65, 0x72, + 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, + 0x77, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x25, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, + 0x74, 0x65, 0x2e, 0x50, 0x65, 0x72, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, + 0x75, 0x74, 0x65, 0x72, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x42, 0x07, + 0x5a, 0x05, 0x2f, 0x63, 0x65, 0x70, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -889,7 +971,7 @@ func file_pcm_ceph_proto_rawDescGZIP() []byte { return file_pcm_ceph_proto_rawDescData } -var file_pcm_ceph_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_pcm_ceph_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_pcm_ceph_proto_goTypes = []interface{}{ (*StorageScreenReq)(nil), // 0: template.StorageScreenReq (*AiCenterInfos)(nil), // 1: template.AiCenterInfos @@ -900,22 +982,24 @@ var file_pcm_ceph_proto_goTypes = []interface{}{ (*PerCenterComputerPowersReq)(nil), // 6: template.PerCenterComputerPowersReq (*PerCenterComputerPowersResp)(nil), // 7: template.PerCenterComputerPowersResp (*PerCenterComputerPowers)(nil), // 8: template.PerCenterComputerPowers + (*AccOtJobInfo)(nil), // 9: template.AccOtJobInfo } var file_pcm_ceph_proto_depIdxs = []int32{ 1, // 0: template.StorageScreenResp.aiCenterInfos:type_name -> template.AiCenterInfos 5, // 1: template.DailyPowerScreenResp.dailyComputerPowers:type_name -> template.DailyComputerPowers 8, // 2: template.PerCenterComputerPowersResp.perCenterComputerPowers:type_name -> template.PerCenterComputerPowers - 0, // 3: template.Ceph.storageScreen:input_type -> template.StorageScreenReq - 3, // 4: template.Ceph.dailyPowerScreen:input_type -> template.DailyPowerScreenReq - 6, // 5: template.Ceph.perCenterComputerPowerScreen:input_type -> template.PerCenterComputerPowersReq - 2, // 6: template.Ceph.storageScreen:output_type -> template.StorageScreenResp - 4, // 7: template.Ceph.dailyPowerScreen:output_type -> template.DailyPowerScreenResp - 7, // 8: template.Ceph.perCenterComputerPowerScreen:output_type -> template.PerCenterComputerPowersResp - 6, // [6:9] is the sub-list for method output_type - 3, // [3:6] is the sub-list for method input_type - 3, // [3:3] is the sub-list for extension type_name - 3, // [3:3] is the sub-list for extension extendee - 0, // [0:3] is the sub-list for field type_name + 9, // 3: template.PerCenterComputerPowersResp.accOtJobInfo:type_name -> template.AccOtJobInfo + 0, // 4: template.Ceph.storageScreen:input_type -> template.StorageScreenReq + 3, // 5: template.Ceph.dailyPowerScreen:input_type -> template.DailyPowerScreenReq + 6, // 6: template.Ceph.perCenterComputerPowerScreen:input_type -> template.PerCenterComputerPowersReq + 2, // 7: template.Ceph.storageScreen:output_type -> template.StorageScreenResp + 4, // 8: template.Ceph.dailyPowerScreen:output_type -> template.DailyPowerScreenResp + 7, // 9: template.Ceph.perCenterComputerPowerScreen:output_type -> template.PerCenterComputerPowersResp + 7, // [7:10] is the sub-list for method output_type + 4, // [4:7] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 4, // [4:4] is the sub-list for extension extendee + 0, // [0:4] is the sub-list for field type_name } func init() { file_pcm_ceph_proto_init() } @@ -1032,6 +1116,18 @@ func file_pcm_ceph_proto_init() { return nil } } + file_pcm_ceph_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AccOtJobInfo); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1039,7 +1135,7 @@ func file_pcm_ceph_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pcm_ceph_proto_rawDesc, NumEnums: 0, - NumMessages: 9, + NumMessages: 10, NumExtensions: 0, NumServices: 1, }, diff --git a/adaptor/PCM-STORAGE/PCM-CEPH/rpc/cephclient/ceph.go b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/cephclient/ceph.go index d23efe84..90d125ed 100644 --- a/adaptor/PCM-STORAGE/PCM-CEPH/rpc/cephclient/ceph.go +++ b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/cephclient/ceph.go @@ -13,6 +13,7 @@ import ( ) type ( + AccOtJobInfo = ceph.AccOtJobInfo AiCenterInfos = ceph.AiCenterInfos DailyComputerPowers = ceph.DailyComputerPowers DailyPowerScreenReq = ceph.DailyPowerScreenReq diff --git a/adaptor/PCM-STORAGE/PCM-CEPH/rpc/pb/pcm-ceph.proto b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/pb/pcm-ceph.proto index 6d1340e3..76f28c75 100644 --- a/adaptor/PCM-STORAGE/PCM-CEPH/rpc/pb/pcm-ceph.proto +++ b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/pb/pcm-ceph.proto @@ -71,9 +71,10 @@ message PerCenterComputerPowersReq{ message PerCenterComputerPowersResp{ int32 totalSize = 1; // @gotags: copier:"TotalSize" repeated PerCenterComputerPowers perCenterComputerPowers = 2; // @gotags: copier:"DailyComputerPowers" - int32 code = 3; // @gotags: copier:"Code" - string msg = 4; // @gotags: copier:"Msg" - string error_msg =5;// @gotags: copier:"ErrorMsg" + AccOtJobInfo accOtJobInfo = 3; + int32 code = 4; // @gotags: copier:"Code" + string msg = 5; // @gotags: copier:"Msg" + string error_msg =6;// @gotags: copier:"ErrorMsg" } message PerCenterComputerPowers{ @@ -83,6 +84,12 @@ message PerCenterComputerPowers{ string centerId = 4; // @gotags: copier:"CenterId" } +message AccOtJobInfo{ + int32 accRunSec = 1; // @gotags: copier:"AccRunSec" + float accCardRunSec = 2; // @gotags: copier:"AccCardRunSec" + int32 accOtJobNum = 3; // @gotags: copier:"AccOtJobNum" +} + /******************screen computing power End*************************/