Explorar o código

Merge branch '11.6'

Roc %!s(int64=2) %!d(string=hai) anos
pai
achega
4e97136346
Modificáronse 1 ficheiros con 5 adicións e 5 borrados
  1. 5 5
      services/data/predict_edb_info_rule.go

+ 5 - 5
services/data/predict_edb_info_rule.go

@@ -700,11 +700,11 @@ func GetChartPredictEdbInfoDataListByRuleFinalValueHc(edbInfoId int, finalValue
 
 		currentDateStr := currentDate.Format(utils.FormatDate)
 		tmpData := &models.EdbDataList{
-			EdbDataId: edbInfoId + 10000000000 + index + k,
-			//EdbInfoId:     edbInfoId,
-			DataTime: currentDateStr,
-			Value:    val,
-			//DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s,说是2022-09-01 00:00:00 这样的整点不合适
+			EdbDataId:     edbInfoId + 10000000000 + index + k,
+			EdbInfoId:     edbInfoId,
+			DataTime:      currentDateStr,
+			Value:         val,
+			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s,说是2022-09-01 00:00:00 这样的整点不合适
 		}
 		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
 		allDataList = append(allDataList, tmpData)