songxiaohang 1 år sedan
förälder
incheckning
840069482c
36 ändrade filer med 383 tillägg och 433 borttagningar
  1. 0 26
      app/cmd/api/internal/handler/datacenter/itemHistoryDataHandler.go
  2. 0 25
      app/cmd/api/internal/handler/datacenter/itemHistoryDataListHandler.go
  3. 0 24
      app/cmd/api/internal/handler/datacenter/workingChestHandler.go
  4. 0 24
      app/cmd/api/internal/handler/datacenter/workingPumpHandler.go
  5. 0 25
      app/cmd/api/internal/handler/datacenter/workingRoHandler.go
  6. 0 25
      app/cmd/api/internal/handler/datacenter/workingUfHandler.go
  7. 0 25
      app/cmd/api/internal/handler/datacenter/workingValveHandler.go
  8. 0 46
      app/cmd/api/internal/logic/datacenter/itemHistoryDataInfoLogic.go
  9. 0 47
      app/cmd/api/internal/logic/datacenter/itemHistoryDataListLogic.go
  10. 0 43
      app/cmd/api/internal/logic/datacenter/itemHistoryDataLogic.go
  11. 0 42
      app/cmd/api/internal/logic/datacenter/workingRoLogic.go
  12. 0 41
      app/cmd/api/internal/logic/datacenter/workingUfLogic.go
  13. 4 4
      app/cmd/dtgateway/desc/dtgateway.api
  14. 0 0
      app/cmd/dtgateway/desc/dtgateway/dtgateway.api
  15. 5 8
      app/cmd/dtgateway/dtgateway.go
  16. 2 2
      app/cmd/dtgateway/etc/dtgateway.yaml
  17. 0 0
      app/cmd/dtgateway/internal/config/config.go
  18. 28 0
      app/cmd/dtgateway/internal/handler/dtgateway/itemHistoryDataHandler.go
  19. 5 5
      app/cmd/dtgateway/internal/handler/dtgateway/itemHistoryDataInfoHandler.go
  20. 28 0
      app/cmd/dtgateway/internal/handler/dtgateway/itemHistoryDataListHandler.go
  21. 28 0
      app/cmd/dtgateway/internal/handler/dtgateway/workingChestHandler.go
  22. 28 0
      app/cmd/dtgateway/internal/handler/dtgateway/workingPumpHandler.go
  23. 28 0
      app/cmd/dtgateway/internal/handler/dtgateway/workingRoHandler.go
  24. 28 0
      app/cmd/dtgateway/internal/handler/dtgateway/workingUfHandler.go
  25. 28 0
      app/cmd/dtgateway/internal/handler/dtgateway/workingValveHandler.go
  26. 11 11
      app/cmd/dtgateway/internal/handler/routes.go
  27. 30 0
      app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataInfoLogic.go
  28. 30 0
      app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataListLogic.go
  29. 30 0
      app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataLogic.go
  30. 3 3
      app/cmd/dtgateway/internal/logic/dtgateway/workingChestLogic.go
  31. 3 3
      app/cmd/dtgateway/internal/logic/dtgateway/workingPumpLogic.go
  32. 30 0
      app/cmd/dtgateway/internal/logic/dtgateway/workingRoLogic.go
  33. 30 0
      app/cmd/dtgateway/internal/logic/dtgateway/workingUfLogic.go
  34. 3 3
      app/cmd/dtgateway/internal/logic/dtgateway/workingValveLogic.go
  35. 1 1
      app/cmd/dtgateway/internal/svc/serviceContext.go
  36. 0 0
      app/cmd/dtgateway/internal/types/types.go

+ 0 - 26
app/cmd/api/internal/handler/datacenter/itemHistoryDataHandler.go

@@ -1,26 +0,0 @@
-package datacenter
-
-import (
-	"GtDataStore/common/result"
-	"net/http"
-
-	"GtDataStore/app/cmd/api/internal/logic/datacenter"
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-	"github.com/zeromicro/go-zero/rest/httpx"
-)
-
-func ItemHistoryDataHandler(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 := datacenter.NewItemHistoryDataLogic(r.Context(), svcCtx)
-		resp, err := l.ItemHistoryData(&req)
-		result.HttpResult(r, w, resp, err)
-
-	}
-}

+ 0 - 25
app/cmd/api/internal/handler/datacenter/itemHistoryDataListHandler.go

@@ -1,25 +0,0 @@
-package datacenter
-
-import (
-	"GtDataStore/common/result"
-	"net/http"
-
-	"GtDataStore/app/cmd/api/internal/logic/datacenter"
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-	"github.com/zeromicro/go-zero/rest/httpx"
-)
-
-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.Error(w, err)
-			return
-		}
-
-		l := datacenter.NewItemHistoryDataListLogic(r.Context(), svcCtx)
-		resp, err := l.ItemHistoryDataList(&req)
-		result.HttpResult(r, w, resp, err)
-	}
-}

+ 0 - 24
app/cmd/api/internal/handler/datacenter/workingChestHandler.go

@@ -1,24 +0,0 @@
-package datacenter
-
-import (
-	"GtDataStore/app/cmd/api/internal/logic/datacenter"
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-	"GtDataStore/common/result"
-	"github.com/zeromicro/go-zero/rest/httpx"
-	"net/http"
-)
-
-func WorkingChestHandler(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.Error(w, err)
-			return
-		}
-
-		l := datacenter.NewWorkingChestLogic(r.Context(), svcCtx)
-		resp, err := l.WorkingChest(&req)
-		result.HttpResult(r, w, resp, err)
-	}
-}

+ 0 - 24
app/cmd/api/internal/handler/datacenter/workingPumpHandler.go

@@ -1,24 +0,0 @@
-package datacenter
-
-import (
-	"GtDataStore/app/cmd/api/internal/logic/datacenter"
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-	"GtDataStore/common/result"
-	"github.com/zeromicro/go-zero/rest/httpx"
-	"net/http"
-)
-
-func WorkingPumpHandler(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.Error(w, err)
-			return
-		}
-
-		l := datacenter.NewWorkingPumpLogic(r.Context(), svcCtx)
-		resp, err := l.WorkingPump(&req)
-		result.HttpResult(r, w, resp, err)
-	}
-}

+ 0 - 25
app/cmd/api/internal/handler/datacenter/workingRoHandler.go

@@ -1,25 +0,0 @@
-package datacenter
-
-import (
-	"net/http"
-
-	"GtDataStore/app/cmd/api/internal/logic/datacenter"
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-	"GtDataStore/common/result"
-	"github.com/zeromicro/go-zero/rest/httpx"
-)
-
-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.Error(w, err)
-			return
-		}
-
-		l := datacenter.NewWorkingRoLogic(r.Context(), svcCtx)
-		resp, err := l.WorkingRo(&req)
-		result.HttpResult(r, w, resp, err)
-	}
-}

+ 0 - 25
app/cmd/api/internal/handler/datacenter/workingUfHandler.go

@@ -1,25 +0,0 @@
-package datacenter
-
-import (
-	"net/http"
-
-	"GtDataStore/app/cmd/api/internal/logic/datacenter"
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-	"GtDataStore/common/result"
-	"github.com/zeromicro/go-zero/rest/httpx"
-)
-
-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.Error(w, err)
-			return
-		}
-
-		l := datacenter.NewWorkingUfLogic(r.Context(), svcCtx)
-		resp, err := l.WorkingUf(&req)
-		result.HttpResult(r, w, resp, err)
-	}
-}

+ 0 - 25
app/cmd/api/internal/handler/datacenter/workingValveHandler.go

@@ -1,25 +0,0 @@
-package datacenter
-
-import (
-	"net/http"
-
-	"GtDataStore/app/cmd/api/internal/logic/datacenter"
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-	"GtDataStore/common/result"
-	"github.com/zeromicro/go-zero/rest/httpx"
-)
-
-func WorkingValveHandler(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.Error(w, err)
-			return
-		}
-
-		l := datacenter.NewWorkingValveLogic(r.Context(), svcCtx)
-		resp, err := l.WorkingValve(&req)
-		result.HttpResult(r, w, resp, err)
-	}
-}

+ 0 - 46
app/cmd/api/internal/logic/datacenter/itemHistoryDataInfoLogic.go

@@ -1,46 +0,0 @@
-package datacenter
-
-import (
-	"GtDataStore/app/cmd/organization/pb"
-	"context"
-	"github.com/jinzhu/copier"
-
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type ItemHistoryDataInfoLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewItemHistoryDataInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ItemHistoryDataInfoLogic {
-	return &ItemHistoryDataInfoLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *ItemHistoryDataInfoLogic) ItemHistoryDataInfo(req *types.ItemHistoryDataByTimeResq) (resp *types.MultiAddItemHistoryDataReq, err error) {
-	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 &types.MultiAddItemHistoryDataReq{List: respList}, nil
-}

+ 0 - 47
app/cmd/api/internal/logic/datacenter/itemHistoryDataListLogic.go

@@ -1,47 +0,0 @@
-package datacenter
-
-import (
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-	"GtDataStore/app/cmd/organization/pb"
-	"context"
-	"github.com/jinzhu/copier"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type ItemHistoryDataListLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewItemHistoryDataListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ItemHistoryDataListLogic {
-	return &ItemHistoryDataListLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *ItemHistoryDataListLogic) ItemHistoryDataList(req *types.ItemHistoryDataListResq) (resp *types.MultiAddItemHistoryDataReq, err error) {
-	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 &types.MultiAddItemHistoryDataReq{List: respList}, nil
-}

+ 0 - 43
app/cmd/api/internal/logic/datacenter/itemHistoryDataLogic.go

@@ -1,43 +0,0 @@
-package datacenter
-
-import (
-	"GtDataStore/app/cmd/organization/pb"
-	"context"
-	"github.com/jinzhu/copier"
-
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type ItemHistoryDataLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewItemHistoryDataLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ItemHistoryDataLogic {
-	return &ItemHistoryDataLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *ItemHistoryDataLogic) ItemHistoryData(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
-}

+ 0 - 42
app/cmd/api/internal/logic/datacenter/workingRoLogic.go

@@ -1,42 +0,0 @@
-package datacenter
-
-import (
-	"GtDataStore/app/cmd/organization/pb"
-	"GtDataStore/common/xerr"
-	"context"
-	"github.com/jinzhu/copier"
-
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type WorkingRoLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewWorkingRoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WorkingRoLogic {
-	return &WorkingRoLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *WorkingRoLogic) WorkingRo(req *types.DcWorkingReq) (resp *types.WorkingRoResp, err error) {
-	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 &types.WorkingRoResp{Info: result}, err
-}

+ 0 - 41
app/cmd/api/internal/logic/datacenter/workingUfLogic.go

@@ -1,41 +0,0 @@
-package datacenter
-
-import (
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
-	"GtDataStore/app/cmd/organization/pb"
-	"GtDataStore/common/xerr"
-	"context"
-	"github.com/jinzhu/copier"
-
-	"github.com/zeromicro/go-zero/core/logx"
-)
-
-type WorkingUfLogic struct {
-	logx.Logger
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-}
-
-func NewWorkingUfLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WorkingUfLogic {
-	return &WorkingUfLogic{
-		Logger: logx.WithContext(ctx),
-		ctx:    ctx,
-		svcCtx: svcCtx,
-	}
-}
-
-func (l *WorkingUfLogic) WorkingUf(req *types.DcWorkingReq) (resp *types.WorkingUfResp, err error) {
-	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 &types.WorkingUfResp{Info: result}, err
-}

+ 4 - 4
app/cmd/api/desc/datacenter.api → app/cmd/dtgateway/desc/dtgateway.api

@@ -1,14 +1,14 @@
 syntax = "v1"
 
 import (
-	"datacenter/datacenter.api"
+	"dtgateway/dtgateway.api"
 )
 
 @server(
-	prefix: api/datacenter/v1
-	group: datacenter
+	prefix: api/dtgateway/v1
+	group: dtgateway
 )
-service datacenter {
+service dtgateway {
 	@doc "查询working uf信息"
 	@handler WorkingUf
 	get /working-uf/info (DcWorkingReq) returns (WorkingUfResp)

+ 0 - 0
app/cmd/api/desc/datacenter/datacenter.api → app/cmd/dtgateway/desc/dtgateway/dtgateway.api


+ 5 - 8
app/cmd/api/dt-gateway-api.go → app/cmd/dtgateway/dtgateway.go

@@ -1,18 +1,18 @@
 package main
 
 import (
-	"GtDataStore/app/cmd/api/internal/config"
-	"GtDataStore/app/cmd/api/internal/handler"
-	"GtDataStore/app/cmd/api/internal/svc"
 	"flag"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
+
+	"GtDataStore/app/cmd/dtgateway/internal/config"
+	"GtDataStore/app/cmd/dtgateway/internal/handler"
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
 )
 
-var configFile = flag.String("f", "etc/dt-gateway-api.yaml", "the config file")
+var configFile = flag.String("f", "etc/dtgateway.yaml", "the config file")
 
 func main() {
 	flag.Parse()
@@ -26,9 +26,6 @@ func main() {
 	ctx := svc.NewServiceContext(c)
 	handler.RegisterHandlers(server, ctx)
 
-	logx.DisableStat()
-
 	fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port)
 	server.Start()
-
 }

+ 2 - 2
app/cmd/api/etc/dt-gateway-api.yaml → app/cmd/dtgateway/etc/dtgateway.yaml

@@ -1,4 +1,4 @@
-Name: datacenter-api
+Name: dtgateway-api
 Host: 0.0.0.0
 Port: 1001
 Mode: dev
@@ -13,7 +13,7 @@ JwtAuth:
 
 #日志配置
 Log:
-  ServiceName: datacenter-api
+  ServiceName: dtgateway-api
   Mode: console
   Level: error
 

+ 0 - 0
app/cmd/api/internal/config/config.go → app/cmd/dtgateway/internal/config/config.go


+ 28 - 0
app/cmd/dtgateway/internal/handler/dtgateway/itemHistoryDataHandler.go

@@ -0,0 +1,28 @@
+package dtgateway
+
+import (
+	"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 ItemHistoryDataHandler(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.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := dtgateway.NewItemHistoryDataLogic(r.Context(), svcCtx)
+		resp, err := l.ItemHistoryData(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+ 5 - 5
app/cmd/api/internal/handler/datacenter/itemHistoryDataInfoHandler.go → app/cmd/dtgateway/internal/handler/dtgateway/itemHistoryDataInfoHandler.go

@@ -1,11 +1,11 @@
-package datacenter
+package dtgateway
 
 import (
 	"net/http"
 
-	"GtDataStore/app/cmd/api/internal/logic/datacenter"
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
+	"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"
 )
 
@@ -17,7 +17,7 @@ func ItemHistoryDataInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			return
 		}
 
-		l := datacenter.NewItemHistoryDataInfoLogic(r.Context(), svcCtx)
+		l := dtgateway.NewItemHistoryDataInfoLogic(r.Context(), svcCtx)
 		resp, err := l.ItemHistoryDataInfo(&req)
 		if err != nil {
 			httpx.ErrorCtx(r.Context(), w, err)

+ 28 - 0
app/cmd/dtgateway/internal/handler/dtgateway/itemHistoryDataListHandler.go

@@ -0,0 +1,28 @@
+package dtgateway
+
+import (
+	"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 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)
+			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)
+		}
+	}
+}

+ 28 - 0
app/cmd/dtgateway/internal/handler/dtgateway/workingChestHandler.go

@@ -0,0 +1,28 @@
+package dtgateway
+
+import (
+	"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 WorkingChestHandler(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)
+			return
+		}
+
+		l := dtgateway.NewWorkingChestLogic(r.Context(), svcCtx)
+		resp, err := l.WorkingChest(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+ 28 - 0
app/cmd/dtgateway/internal/handler/dtgateway/workingPumpHandler.go

@@ -0,0 +1,28 @@
+package dtgateway
+
+import (
+	"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 WorkingPumpHandler(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)
+			return
+		}
+
+		l := dtgateway.NewWorkingPumpLogic(r.Context(), svcCtx)
+		resp, err := l.WorkingPump(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+ 28 - 0
app/cmd/dtgateway/internal/handler/dtgateway/workingRoHandler.go

@@ -0,0 +1,28 @@
+package dtgateway
+
+import (
+	"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 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)
+			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)
+		}
+	}
+}

+ 28 - 0
app/cmd/dtgateway/internal/handler/dtgateway/workingUfHandler.go

@@ -0,0 +1,28 @@
+package dtgateway
+
+import (
+	"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 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)
+			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)
+		}
+	}
+}

+ 28 - 0
app/cmd/dtgateway/internal/handler/dtgateway/workingValveHandler.go

@@ -0,0 +1,28 @@
+package dtgateway
+
+import (
+	"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 WorkingValveHandler(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)
+			return
+		}
+
+		l := dtgateway.NewWorkingValveLogic(r.Context(), svcCtx)
+		resp, err := l.WorkingValve(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+ 11 - 11
app/cmd/api/internal/handler/routes.go → app/cmd/dtgateway/internal/handler/routes.go

@@ -4,8 +4,8 @@ package handler
 import (
 	"net/http"
 
-	datacenter "GtDataStore/app/cmd/api/internal/handler/datacenter"
-	"GtDataStore/app/cmd/api/internal/svc"
+	dtgateway "GtDataStore/app/cmd/dtgateway/internal/handler/dtgateway"
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
 
 	"github.com/zeromicro/go-zero/rest"
 )
@@ -16,44 +16,44 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			{
 				Method:  http.MethodGet,
 				Path:    "/working-uf/info",
-				Handler: datacenter.WorkingUfHandler(serverCtx),
+				Handler: dtgateway.WorkingUfHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/working-ro/info",
-				Handler: datacenter.WorkingRoHandler(serverCtx),
+				Handler: dtgateway.WorkingRoHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/working-chest/info",
-				Handler: datacenter.WorkingChestHandler(serverCtx),
+				Handler: dtgateway.WorkingChestHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/working-pump/info",
-				Handler: datacenter.WorkingPumpHandler(serverCtx),
+				Handler: dtgateway.WorkingPumpHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/working-valve/info",
-				Handler: datacenter.WorkingValveHandler(serverCtx),
+				Handler: dtgateway.WorkingValveHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/item-history/multi-add",
-				Handler: datacenter.ItemHistoryDataHandler(serverCtx),
+				Handler: dtgateway.ItemHistoryDataHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/item-history/list",
-				Handler: datacenter.ItemHistoryDataListHandler(serverCtx),
+				Handler: dtgateway.ItemHistoryDataListHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/item-history/info",
-				Handler: datacenter.ItemHistoryDataInfoHandler(serverCtx),
+				Handler: dtgateway.ItemHistoryDataInfoHandler(serverCtx),
 			},
 		},
-		rest.WithPrefix("/api/datacenter/v1"),
+		rest.WithPrefix("/api/dtgateway/v1"),
 	)
 }

+ 30 - 0
app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataInfoLogic.go

@@ -0,0 +1,30 @@
+package dtgateway
+
+import (
+	"context"
+
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
+	"GtDataStore/app/cmd/dtgateway/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ItemHistoryDataInfoLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewItemHistoryDataInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ItemHistoryDataInfoLogic {
+	return &ItemHistoryDataInfoLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *ItemHistoryDataInfoLogic) ItemHistoryDataInfo(req *types.ItemHistoryDataByTimeResq) (resp *types.MultiAddItemHistoryDataReq, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 30 - 0
app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataListLogic.go

@@ -0,0 +1,30 @@
+package dtgateway
+
+import (
+	"context"
+
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
+	"GtDataStore/app/cmd/dtgateway/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ItemHistoryDataListLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewItemHistoryDataListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ItemHistoryDataListLogic {
+	return &ItemHistoryDataListLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *ItemHistoryDataListLogic) ItemHistoryDataList(req *types.ItemHistoryDataListResq) (resp *types.MultiAddItemHistoryDataReq, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 30 - 0
app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataLogic.go

@@ -0,0 +1,30 @@
+package dtgateway
+
+import (
+	"context"
+
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
+	"GtDataStore/app/cmd/dtgateway/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ItemHistoryDataLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewItemHistoryDataLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ItemHistoryDataLogic {
+	return &ItemHistoryDataLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *ItemHistoryDataLogic) ItemHistoryData(req *types.MultiAddItemHistoryDataReq) (resp *types.MultiAddItemHistoryDataResq, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 3 - 3
app/cmd/api/internal/logic/datacenter/workingChestLogic.go → app/cmd/dtgateway/internal/logic/dtgateway/workingChestLogic.go

@@ -1,10 +1,10 @@
-package datacenter
+package dtgateway
 
 import (
 	"context"
 
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
+	"GtDataStore/app/cmd/dtgateway/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 3
app/cmd/api/internal/logic/datacenter/workingPumpLogic.go → app/cmd/dtgateway/internal/logic/dtgateway/workingPumpLogic.go

@@ -1,10 +1,10 @@
-package datacenter
+package dtgateway
 
 import (
 	"context"
 
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
+	"GtDataStore/app/cmd/dtgateway/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 30 - 0
app/cmd/dtgateway/internal/logic/dtgateway/workingRoLogic.go

@@ -0,0 +1,30 @@
+package dtgateway
+
+import (
+	"context"
+
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
+	"GtDataStore/app/cmd/dtgateway/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type WorkingRoLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewWorkingRoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WorkingRoLogic {
+	return &WorkingRoLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *WorkingRoLogic) WorkingRo(req *types.DcWorkingReq) (resp *types.WorkingRoResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 30 - 0
app/cmd/dtgateway/internal/logic/dtgateway/workingUfLogic.go

@@ -0,0 +1,30 @@
+package dtgateway
+
+import (
+	"context"
+
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
+	"GtDataStore/app/cmd/dtgateway/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type WorkingUfLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewWorkingUfLogic(ctx context.Context, svcCtx *svc.ServiceContext) *WorkingUfLogic {
+	return &WorkingUfLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *WorkingUfLogic) WorkingUf(req *types.DcWorkingReq) (resp *types.WorkingUfResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+ 3 - 3
app/cmd/api/internal/logic/datacenter/workingValveLogic.go → app/cmd/dtgateway/internal/logic/dtgateway/workingValveLogic.go

@@ -1,10 +1,10 @@
-package datacenter
+package dtgateway
 
 import (
 	"context"
 
-	"GtDataStore/app/cmd/api/internal/svc"
-	"GtDataStore/app/cmd/api/internal/types"
+	"GtDataStore/app/cmd/dtgateway/internal/svc"
+	"GtDataStore/app/cmd/dtgateway/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 1 - 1
app/cmd/api/internal/svc/serviceContext.go → app/cmd/dtgateway/internal/svc/serviceContext.go

@@ -1,7 +1,7 @@
 package svc
 
 import (
-	"GtDataStore/app/cmd/api/internal/config"
+	"GtDataStore/app/cmd/dtgateway/internal/config"
 	"GtDataStore/app/cmd/organization/organization"
 	"github.com/zeromicro/go-zero/zrpc"
 )

+ 0 - 0
app/cmd/api/internal/types/types.go → app/cmd/dtgateway/internal/types/types.go