网关层

app/cmd/dtgateway/desc/dtgateway.api

@@ -30,7 +30,7 @@ service dtgateway {
 	get /working-valve/info (DcWorkingReq) returns (WorkingValveResp)
 	
 	@doc "秒级单点数据批量入库"
-	@handler ItemHistoryData
+	@handler ItemHistoryDataMultiAdd
 	post /item-history/multi-add (MultiAddItemHistoryDataReq) returns (MultiAddItemHistoryDataResq)
 	
 	@doc "点位历史数据查询"

app/cmd/dtgateway/internal/handler/dtgateway/itemHistoryDataInfoHandler.go

@@ -1,6 +1,7 @@
 package dtgateway
 
 import (
+	"GtDataStore/common/result"
 	"net/http"
 
 	"GtDataStore/app/cmd/dtgateway/internal/logic/dtgateway"
@@ -13,16 +14,12 @@ func ItemHistoryDataInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.ItemHistoryDataByTimeResq
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			httpx.Error(w, err)
 			return
 		}
 
 		l := dtgateway.NewItemHistoryDataInfoLogic(r.Context(), svcCtx)
 		resp, err := l.ItemHistoryDataInfo(&req)
-		if err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
-		} else {
-			httpx.OkJsonCtx(r.Context(), w, resp)
-		}
+		result.HttpResult(r, w, resp, err)
 	}
 }

app/cmd/dtgateway/internal/handler/dtgateway/itemHistoryDataListHandler.go

@@ -1,6 +1,7 @@
 package dtgateway
 
 import (
+	"GtDataStore/common/result"
 	"net/http"
 
 	"GtDataStore/app/cmd/dtgateway/internal/logic/dtgateway"
@@ -13,16 +14,12 @@ func ItemHistoryDataListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.ItemHistoryDataListResq
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			httpx.Error(w, err)
 			return
 		}
 
 		l := dtgateway.NewItemHistoryDataListLogic(r.Context(), svcCtx)
 		resp, err := l.ItemHistoryDataList(&req)
-		if err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
-		} else {
-			httpx.OkJsonCtx(r.Context(), w, resp)
-		}
+		result.HttpResult(r, w, resp, err)
 	}
 }

app/cmd/dtgateway/internal/handler/dtgateway/itemHistoryDataMultiAddHandler.go

@@ -0,0 +1,26 @@
+package dtgateway
+
+import (
+	"GtDataStore/common/result"
+	"net/http"
+
+	"GtDataStore/app/cmd/dtgateway/internal/logic/dtgateway"
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
+	"GtDataStore/app/cmd/dtgateway/internal/types"
+	"github.com/zeromicro/go-zero/rest/httpx"
+)
+
+func ItemHistoryDataMultiAddHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.MultiAddItemHistoryDataReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.Error(w, err)
+			return
+		}
+
+		l := dtgateway.NewItemHistoryDataMultiAddLogic(r.Context(), svcCtx)
+		resp, err := l.ItemHistoryDataMultiAdd(&req)
+		result.HttpResult(r, w, resp, err)
+
+	}
+}

app/cmd/dtgateway/internal/handler/dtgateway/workingRoHandler.go

@@ -1,6 +1,7 @@
 package dtgateway
 
 import (
+	"GtDataStore/common/result"
 	"net/http"
 
 	"GtDataStore/app/cmd/dtgateway/internal/logic/dtgateway"
@@ -13,16 +14,12 @@ func WorkingRoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.DcWorkingReq
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			httpx.Error(w, err)
 			return
 		}
 
 		l := dtgateway.NewWorkingRoLogic(r.Context(), svcCtx)
 		resp, err := l.WorkingRo(&req)
-		if err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
-		} else {
-			httpx.OkJsonCtx(r.Context(), w, resp)
-		}
+		result.HttpResult(r, w, resp, err)
 	}
 }

app/cmd/dtgateway/internal/handler/dtgateway/workingUfHandler.go

@@ -1,6 +1,7 @@
 package dtgateway
 
 import (
+	"GtDataStore/common/result"
 	"net/http"
 
 	"GtDataStore/app/cmd/dtgateway/internal/logic/dtgateway"
@@ -13,16 +14,12 @@ func WorkingUfHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.DcWorkingReq
 		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
+			httpx.Error(w, err)
 			return
 		}
 
 		l := dtgateway.NewWorkingUfLogic(r.Context(), svcCtx)
 		resp, err := l.WorkingUf(&req)
-		if err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
-		} else {
-			httpx.OkJsonCtx(r.Context(), w, resp)
-		}
+		result.HttpResult(r, w, resp, err)
 	}
 }

app/cmd/dtgateway/internal/handler/routes.go

@@ -41,7 +41,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			{
 				Method:  http.MethodPost,
 				Path:    "/item-history/multi-add",
-				Handler: dtgateway.ItemHistoryDataHandler(serverCtx),
+				Handler: dtgateway.ItemHistoryDataMultiAddHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,

app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataInfoLogic.go

@@ -1,7 +1,9 @@
 package dtgateway
 
 import (
+	"GtDataStore/app/cmd/organization/pb"
 	"context"
+	"github.com/jinzhu/copier"
 
 	"GtDataStore/app/cmd/dtgateway/internal/svc"
 	"GtDataStore/app/cmd/dtgateway/internal/types"
@@ -24,7 +26,21 @@ func NewItemHistoryDataInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext
 }
 
 func (l *ItemHistoryDataInfoLogic) ItemHistoryDataInfo(req *types.ItemHistoryDataByTimeResq) (resp *types.MultiAddItemHistoryDataReq, err error) {
-	// todo: add your logic here and delete this line
+	respList := make([]*types.ItemHistoryData, 0)
+	dataList, err := l.svcCtx.OrganizationRpc.ItemHistoryDataByTime(l.ctx, &pb.ItemHistoryDataByTimeReq{
+		ProjectId: req.ProjectId,
+		ItemName:  req.ItemName,
+		Stime:     req.STime,
+		Etime:     req.ETime,
+	})
+	if err != nil {
+		return nil, err
+	}
+	for _, line := range dataList.List {
+		tmp := &types.ItemHistoryData{}
+		_ = copier.Copy(tmp, line)
+		respList = append(respList, tmp)
+	}
 
-	return
+	return &types.MultiAddItemHistoryDataReq{List: respList}, nil
 }

app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataListLogic.go

@@ -1,7 +1,9 @@
 package dtgateway
 
 import (
+	"GtDataStore/app/cmd/organization/pb"
 	"context"
+	"github.com/jinzhu/copier"
 
 	"GtDataStore/app/cmd/dtgateway/internal/svc"
 	"GtDataStore/app/cmd/dtgateway/internal/types"
@@ -24,7 +26,23 @@ func NewItemHistoryDataListLogic(ctx context.Context, svcCtx *svc.ServiceContext
 }
 
 func (l *ItemHistoryDataListLogic) ItemHistoryDataList(req *types.ItemHistoryDataListResq) (resp *types.MultiAddItemHistoryDataReq, err error) {
-	// todo: add your logic here and delete this line
+	respList := make([]*types.ItemHistoryData, 0)
+	dataList, err := l.svcCtx.OrganizationRpc.ItemHistoryDataList(l.ctx, &pb.ItemHistoryDataListReq{
+		ProjectId:  req.ProjectId,
+		ItemName:   req.ItemName,
+		Interval:   req.Interval,
+		Aggregator: req.Aggregator,
+		Stime:      req.STime,
+		Etime:      req.ETime,
+	})
+	if err != nil {
+		return nil, err
+	}
+	for _, line := range dataList.List {
+		tmp := &types.ItemHistoryData{}
+		_ = copier.Copy(tmp, line)
+		respList = append(respList, tmp)
+	}
 
-	return
+	return &types.MultiAddItemHistoryDataReq{List: respList}, nil
 }

app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataMultiAddLogic.go

@@ -0,0 +1,43 @@
+package dtgateway
+
+import (
+	"GtDataStore/app/cmd/organization/pb"
+	"context"
+	"github.com/jinzhu/copier"
+
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
+	"GtDataStore/app/cmd/dtgateway/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ItemHistoryDataMultiAddLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewItemHistoryDataMultiAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ItemHistoryDataMultiAddLogic {
+	return &ItemHistoryDataMultiAddLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *ItemHistoryDataMultiAddLogic) ItemHistoryDataMultiAdd(req *types.MultiAddItemHistoryDataReq) (resp *types.MultiAddItemHistoryDataResq, err error) {
+	dataList := make([]*pb.ItemHistoryData, 0)
+	for _, line := range req.List {
+		tmp := &pb.ItemHistoryData{}
+		_ = copier.Copy(tmp, line)
+		dataList = append(dataList, tmp)
+	}
+	_, err = l.svcCtx.OrganizationRpc.MultiAddItemHistoryData(l.ctx, &pb.MultiAddItemHistoryDataReq{
+		List: dataList,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.MultiAddItemHistoryDataResq{}, nil
+}

app/cmd/dtgateway/internal/logic/dtgateway/workingRoLogic.go

@@ -1,7 +1,10 @@
 package dtgateway
 
 import (
+	"GtDataStore/app/cmd/organization/pb"
+	"GtDataStore/common/xerr"
 	"context"
+	"github.com/jinzhu/copier"
 
 	"GtDataStore/app/cmd/dtgateway/internal/svc"
 	"GtDataStore/app/cmd/dtgateway/internal/types"
@@ -24,7 +27,16 @@ func NewWorkingRoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Working
 }
 
 func (l *WorkingRoLogic) WorkingRo(req *types.DcWorkingReq) (resp *types.WorkingRoResp, err error) {
-	// todo: add your logic here and delete this line
+	rpcResp, err := l.svcCtx.OrganizationRpc.GetWorkingUfByCode(l.ctx, &pb.DcWorkingReq{
+		ProjectId:  req.ProjectId,
+		DeviceCode: req.DeviceCode,
+	})
+	if err != nil {
+		return nil, xerr.NewErrMsg("获取数据失败")
+	}
+
+	result := &types.DcWorkingRo{}
+	_ = copier.Copy(result, rpcResp)
 
-	return
+	return &types.WorkingRoResp{Info: result}, err
 }

app/cmd/dtgateway/internal/logic/dtgateway/workingUfLogic.go

@@ -1,7 +1,10 @@
 package dtgateway
 
 import (
+	"GtDataStore/app/cmd/organization/pb"
+	"GtDataStore/common/xerr"
 	"context"
+	"github.com/jinzhu/copier"
 
 	"GtDataStore/app/cmd/dtgateway/internal/svc"
 	"GtDataStore/app/cmd/dtgateway/internal/types"
@@ -24,7 +27,16 @@ func NewWorkingUfLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Working
 }
 
 func (l *WorkingUfLogic) WorkingUf(req *types.DcWorkingReq) (resp *types.WorkingUfResp, err error) {
-	// todo: add your logic here and delete this line
+	rpcResp, err := l.svcCtx.OrganizationRpc.GetWorkingUfByCode(l.ctx, &pb.DcWorkingReq{
+		ProjectId:  req.ProjectId,
+		DeviceCode: req.DeviceCode,
+	})
+	if err != nil {
+		return nil, xerr.NewErrMsg("获取数据失败")
+	}
+
+	result := &types.DcWorkingUf{}
+	_ = copier.Copy(result, rpcResp)
 
-	return
+	return &types.WorkingUfResp{Info: result}, err
 }