Merge remote-tracking branch 'origin/master'

app/cmd/dtgateway/desc/dtgateway.api

@@ -13,35 +13,35 @@ service dtgateway {
 	@doc "查询working uf信息"
 	@handler WorkingUf
 	get /working-uf/info (DcWorkingReq) returns (CommonResponse)
-
+	
 	@doc "查询working ro信息"
 	@handler WorkingRo
 	get /working-ro/info (DcWorkingReq) returns (CommonResponse)
-
+	
 	@doc "查询working chest信息"
 	@handler WorkingChest
 	get /working-chest/info (DcWorkingReq) returns (CommonResponse)
-
+	
 	@doc "查询working pump信息"
 	@handler WorkingPump
 	get /working-pump/info (DcWorkingReq) returns (CommonResponse)
-
+	
 	@doc "查询working valve信息"
 	@handler WorkingValve
 	get /working-valve/info (DcWorkingReq) returns (CommonResponse)
-
+	
 	@doc "秒级单点数据批量入库"
 	@handler ItemHistoryDataMultiAdd
 	post /item-history/multi-add (MultiAddItemHistoryDataReq) returns (CommonResponse)
-
+	
 	@doc "点位历史数据查询"
 	@handler ItemHistoryDataList
 	get /item-history/list (ItemHistoryDataListReq) returns (CommonResponse)
-
+	
 	@doc "按时间点位历史数据查询"
 	@handler ItemHistoryDataInfo
 	get /item-history/info (ItemHistoryDataByTimeReq) returns (CommonResponse)
-
+	
 	@doc "按时间点位历史数据最大值最小值查询"
 	@handler ItemHistoryDataMaxMin
 	get /item-history/max-min (ItemHistoryDataMaxMinByTimeReq) returns (CommonResponse)

app/cmd/dtgateway/desc/dtgateway/dtgateway.api

@@ -26,13 +26,14 @@ type (
     }
 
     ItemHistoryData {
-        CommonParams
+        ProjectId int64 `json:"project_id"`
         ItemName string `json:"item_name"`
         Val float64 `json:"val"`
         HTime string `json:"h_time"`
     }
 
     MultiAddItemHistoryDataReq {
+        CommonParams
         List []*ItemHistoryData `json:"list"`
     }
 

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

@@ -6,8 +6,6 @@ import (
 	"GtDataStore/app/cmd/organization/pb"
 	"GtDataStore/common/xerr"
 	"context"
-	"fmt"
-
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
@@ -32,7 +30,6 @@ func (l *ItemHistoryDataInfoLogic) ItemHistoryDataInfo(req *types.ItemHistoryDat
 		Stime:     req.STime,
 		Etime:     req.ETime,
 	})
-	fmt.Println("rpc:", dataList)
 	if err != nil {
 		return nil, err
 	}

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

@@ -7,6 +7,7 @@ import (
 	"GtDataStore/common/xerr"
 	"context"
 	"errors"
+	"fmt"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -39,7 +40,7 @@ func (l *ItemHistoryDataMultiAddLogic) ItemHistoryDataMultiAdd(req *types.MultiA
 			HTime:     line.HTime,
 		}
 	}
-
+	fmt.Println("project_id:", req.List[0].ProjectId)
 	_, err = l.svcCtx.OrganizationRpc.MultiAddItemHistoryData(l.ctx, &pb.MultiAddItemHistoryDataReq{
 		ProjectId: req.List[0].ProjectId,
 		List:      dataList,

app/cmd/dtgateway/internal/middleware/datasignMiddleware.go

@@ -9,6 +9,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/zeromicro/go-zero/core/service"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
 	"github.com/zeromicro/go-zero/core/validation"
 	"github.com/zeromicro/go-zero/rest/httpx"
@@ -34,6 +35,7 @@ var (
 	appSecrets     = make(map[string]secretExpire)
 	appSecretsLock sync.Mutex
 	validator      atomic.Value
+	confMode       string
 )
 
 type (
@@ -57,6 +59,7 @@ type (
 )
 
 func NewDataSignMiddleware(conf config.Config) *DataSignMiddleware {
+	confMode = conf.Mode
 	mysql := sqlx.NewMysql(conf.DtDataStoreDB.DataSource)
 	return &DataSignMiddleware{
 		AppInfo: model.NewDcAppInfoModel(mysql),
@@ -64,6 +67,11 @@ func NewDataSignMiddleware(conf config.Config) *DataSignMiddleware {
 }
 
 func (m *DataSignMiddleware) Handle(next http.HandlerFunc) http.HandlerFunc {
+	if confMode == service.DevMode {
+		return func(w http.ResponseWriter, r *http.Request) {
+			next(w, r)
+		}
+	}
 	return func(w http.ResponseWriter, r *http.Request) {
 		cps := CommonParams{}
 		err := m.parseCommonParams(r, &cps)

app/cmd/dtgateway/internal/types/types.go

@@ -26,13 +26,14 @@ type DcWorkingReq struct {
 }
 
 type ItemHistoryData struct {
-	CommonParams
-	ItemName string  `json:"item_name"`
-	Val      float64 `json:"val"`
-	HTime    string  `json:"h_time"`
+	ProjectId int64   `json:"project_id"`
+	ItemName  string  `json:"item_name"`
+	Val       float64 `json:"val"`
+	HTime     string  `json:"h_time"`
 }
 
 type MultiAddItemHistoryDataReq struct {
+	CommonParams
 	List []*ItemHistoryData `json:"list"`
 }