Browse Source

项目ID问题

songxiaohang 1 year ago
parent
commit
f90f2b4f0d

+ 8 - 8
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)

+ 1 - 1
app/cmd/dtgateway/desc/dtgateway/dtgateway.api

@@ -26,7 +26,7 @@ type (
     }
 
     ItemHistoryData {
-        CommonParams
+        ProjectId int64 `json:"project_id"`
         ItemName string `json:"item_name"`
         Val float64 `json:"val"`
         HTime string `json:"h_time"`

+ 3 - 3
app/cmd/dtgateway/internal/logic/dtgateway/itemHistoryDataMultiAddLogic.go

@@ -34,15 +34,15 @@ func (l *ItemHistoryDataMultiAddLogic) ItemHistoryDataMultiAdd(req *types.MultiA
 	dataList := make([]*pb.ItemHistoryData, len(req.List))
 	for i, line := range req.List {
 		dataList[i] = &pb.ItemHistoryData{
-			ProjectId: line.CommonParams.ProjectId,
+			ProjectId: line.ProjectId,
 			ItemName:  line.ItemName,
 			Val:       line.Val,
 			HTime:     line.HTime,
 		}
 	}
-	fmt.Println("project_id:", req.List[0].CommonParams.ProjectId)
+	fmt.Println("project_id:", req.List[0].ProjectId)
 	_, err = l.svcCtx.OrganizationRpc.MultiAddItemHistoryData(l.ctx, &pb.MultiAddItemHistoryDataReq{
-		ProjectId: req.List[0].CommonParams.ProjectId,
+		ProjectId: req.List[0].ProjectId,
 		List:      dataList,
 	})
 	if err != nil {

+ 4 - 4
app/cmd/dtgateway/internal/types/types.go

@@ -26,10 +26,10 @@ 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 {