Merge remote-tracking branch 'origin/master'

envitem/func.go

@@ -527,9 +527,9 @@ func getAdjustStringVal(projectId int64, item string) (string, error) {
 
 func (v *VirtualPlcItem) GetVirtualPlcItems() (*VirtualPlcItemResp, error) {
 
-	plcItemUrl = fmt.Sprintf("%s%d", plcItemUrl, v.ProjectId)
+	tmpPlcItemUrl := fmt.Sprintf("%s%d", plcItemUrl, v.ProjectId)
 
-	req := httplib.Get(plcItemUrl)
+	req := httplib.Get(tmpPlcItemUrl)
 	req.Param("project_id", fmt.Sprintf("%d", v.ProjectId))
 	req.Param("pageSize", fmt.Sprintf("%d", v.PageSize))
 

envitem/types.go

@@ -54,10 +54,11 @@ type (
 		PageSize  int `json:"pageSize"`
 	}
 	VirtualPlc struct {
-		ItemName   string `json:"ItemName"`
-		Expression string `json:"Expression"`
-		Frequency  int    `json:"frequency"`
-		IsVirtual  int    `json:"IsVirtual"`
+		ItemName    string `json:"ItemName"`
+		Expression  string `json:"Expression"`
+		Frequency   int    `json:"frequency"`
+		IsVirtual   int    `json:"IsVirtual"`
+		ItemPrecise int    `json:"ItemPrecise"`
 	}
 	VirtualPlcPage struct {
 		List []*VirtualPlc `json:"list"`

readme.md

@@ -14,3 +14,7 @@
 > 2. GOPRIVATE中增加私有仓库地址: 该部分请自行将其设置为全局环境变量
 > 
 >> * export GOPRIVATE=${GOPRIVATE},metawant.greentech.com.cn
+
+#### rpc调用说明
+> 1. 将proto文件放在rpc_client对应文件夹(若没有可新建)下
+> 2. 进入对应文件夹下，生成go代码命令 protoc --go_out=./ --go-grpc_out=./ *.proto

rpc_client/datacenter/datacenter.proto

@@ -397,8 +397,12 @@ message WorkingRo{
   double       product_wq_p = 46;         // 产水水质：磷
   // gotags: json:"step"
   int64        step = 47;                 // 设备当前步序值
+  // @gotags: json:"filter_time"
+  double filter_time = 48;
+  // @gotags: json:"filter_cycle"
+  int64 filter_cycle = 49;
   // gotags: json:"c_time"
-  string       c_time = 48;
+  string       c_time = 50;
 }
 
 message WorkingChest {
@@ -768,6 +772,19 @@ message HealthResp {
   string msg = 4;
 }
 
+message CurrentItem {
+    string item_name = 1;
+    string val = 2;
+    string h_time = 3;
+}
+message CurrentDataReq {
+    int64 project_id = 1;
+    string item_name = 2;
+}
+message CurrentDataResp {
+    repeated CurrentItem item = 1;
+}
+
 service Organization {
   rpc GetWorkingUfByCode(DcWorkingReq) returns(GetWorkingUfByCodeResp);
   rpc FindWorkingUfByCycle(FindWorkingUfByCycleReq) returns(FindWorkingUfByCycleResp);
@@ -798,5 +815,7 @@ service Organization {
   rpc FindDataMinAndMax (FindDataMinAndMaxReq) returns (FindDataMinAndMaxResp);
   rpc FindDataCorrelation (FindDataCorrelationReq) returns (FindDataCorrelationResp);
 
+  rpc CurrentData (CurrentDataReq) returns (CurrentDataResp);
+
   rpc Health (HealthReq) returns (HealthResp);
 }

rpc_client/datacenter/pb/datacenter_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.3.0
-// - protoc             v3.21.11
+// - protoc             v3.20.3
 // source: datacenter.proto
 
 package pb
@@ -44,10 +44,11 @@ const (
 	Organization_FindDataDescribe_FullMethodName               = "/pb.Organization/FindDataDescribe"
 	Organization_FindDataMinAndMax_FullMethodName              = "/pb.Organization/FindDataMinAndMax"
 	Organization_FindDataCorrelation_FullMethodName            = "/pb.Organization/FindDataCorrelation"
+	Organization_CurrentData_FullMethodName                    = "/pb.Organization/CurrentData"
 	Organization_Health_FullMethodName                         = "/pb.Organization/Health"
 )
 
-// OrganizationClient is the client API for Organization v1.
+// OrganizationClient is the client API for Organization service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type OrganizationClient interface {
@@ -76,6 +77,7 @@ type OrganizationClient interface {
 	FindDataDescribe(ctx context.Context, in *FindDataDescribeReq, opts ...grpc.CallOption) (*FindDataDescribeResp, error)
 	FindDataMinAndMax(ctx context.Context, in *FindDataMinAndMaxReq, opts ...grpc.CallOption) (*FindDataMinAndMaxResp, error)
 	FindDataCorrelation(ctx context.Context, in *FindDataCorrelationReq, opts ...grpc.CallOption) (*FindDataCorrelationResp, error)
+	CurrentData(ctx context.Context, in *CurrentDataReq, opts ...grpc.CallOption) (*CurrentDataResp, error)
 	Health(ctx context.Context, in *HealthReq, opts ...grpc.CallOption) (*HealthResp, error)
 }
 
@@ -312,6 +314,15 @@ func (c *organizationClient) FindDataCorrelation(ctx context.Context, in *FindDa
 	return out, nil
 }
 
+func (c *organizationClient) CurrentData(ctx context.Context, in *CurrentDataReq, opts ...grpc.CallOption) (*CurrentDataResp, error) {
+	out := new(CurrentDataResp)
+	err := c.cc.Invoke(ctx, Organization_CurrentData_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *organizationClient) Health(ctx context.Context, in *HealthReq, opts ...grpc.CallOption) (*HealthResp, error) {
 	out := new(HealthResp)
 	err := c.cc.Invoke(ctx, Organization_Health_FullMethodName, in, out, opts...)
@@ -321,7 +332,7 @@ func (c *organizationClient) Health(ctx context.Context, in *HealthReq, opts ...
 	return out, nil
 }
 
-// OrganizationServer is the server API for Organization v1.
+// OrganizationServer is the server API for Organization service.
 // All implementations must embed UnimplementedOrganizationServer
 // for forward compatibility
 type OrganizationServer interface {
@@ -350,6 +361,7 @@ type OrganizationServer interface {
 	FindDataDescribe(context.Context, *FindDataDescribeReq) (*FindDataDescribeResp, error)
 	FindDataMinAndMax(context.Context, *FindDataMinAndMaxReq) (*FindDataMinAndMaxResp, error)
 	FindDataCorrelation(context.Context, *FindDataCorrelationReq) (*FindDataCorrelationResp, error)
+	CurrentData(context.Context, *CurrentDataReq) (*CurrentDataResp, error)
 	Health(context.Context, *HealthReq) (*HealthResp, error)
 	mustEmbedUnimplementedOrganizationServer()
 }
@@ -433,12 +445,15 @@ func (UnimplementedOrganizationServer) FindDataMinAndMax(context.Context, *FindD
 func (UnimplementedOrganizationServer) FindDataCorrelation(context.Context, *FindDataCorrelationReq) (*FindDataCorrelationResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindDataCorrelation not implemented")
 }
+func (UnimplementedOrganizationServer) CurrentData(context.Context, *CurrentDataReq) (*CurrentDataResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CurrentData not implemented")
+}
 func (UnimplementedOrganizationServer) Health(context.Context, *HealthReq) (*HealthResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Health not implemented")
 }
 func (UnimplementedOrganizationServer) mustEmbedUnimplementedOrganizationServer() {}
 
-// UnsafeOrganizationServer may be embedded to opt out of forward compatibility for this v1.
+// UnsafeOrganizationServer may be embedded to opt out of forward compatibility for this service.
 // Use of this interface is not recommended, as added methods to OrganizationServer will
 // result in compilation errors.
 type UnsafeOrganizationServer interface {
@@ -899,6 +914,24 @@ func _Organization_FindDataCorrelation_Handler(srv interface{}, ctx context.Cont
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Organization_CurrentData_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CurrentDataReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OrganizationServer).CurrentData(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Organization_CurrentData_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OrganizationServer).CurrentData(ctx, req.(*CurrentDataReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Organization_Health_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(HealthReq)
 	if err := dec(in); err != nil {
@@ -917,7 +950,7 @@ func _Organization_Health_Handler(srv interface{}, ctx context.Context, dec func
 	return interceptor(ctx, in, info, handler)
 }
 
-// Organization_ServiceDesc is the grpc.ServiceDesc for Organization v1.
+// Organization_ServiceDesc is the grpc.ServiceDesc for Organization service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
 var Organization_ServiceDesc = grpc.ServiceDesc{
@@ -1024,6 +1057,10 @@ var Organization_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "FindDataCorrelation",
 			Handler:    _Organization_FindDataCorrelation_Handler,
 		},
+		{
+			MethodName: "CurrentData",
+			Handler:    _Organization_CurrentData_Handler,
+		},
 		{
 			MethodName: "Health",
 			Handler:    _Organization_Health_Handler,