Merge remote-tracking branch 'origin/master' into debug

services/data/predict_edb_info_rule.go

@@ -25,7 +25,7 @@ func GetChartPredictEdbInfoDataListByRule1(edbInfoId int, dataValue float64, sta
 			EdbInfoId:     edbInfoId,
 			DataTime:      v.Format(utils.FormatDate),
 			Value:         dataValue,
-			DataTimestamp: (v.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: v.UnixNano() / 1e6,
 		})
 		existMap[v.Format(utils.FormatDate)] = dataValue
 	}
@@ -52,7 +52,7 @@ func GetChartPredictEdbInfoDataListByRuleTb(edbInfoId int, tbValue float64, star
 			EdbInfoId: edbInfoId,
 			DataTime:  currentDate.Format(utils.FormatDate),
 			//Value:         dataValue,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 
 		var val float64
@@ -179,7 +179,7 @@ func GetChartPredictEdbInfoDataListByRuleTc(edbInfoId int, tcValue float64, star
 			EdbInfoId: edbInfoId,
 			DataTime:  currentDate.Format(utils.FormatDate),
 			//Value:         dataValue,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 
 		var val float64
@@ -308,7 +308,7 @@ func GetChartPredictEdbInfoDataListByRuleHb(edbInfoId int, hbValue float64, star
 			EdbInfoId:     edbInfoId,
 			DataTime:      currentDateStr,
 			Value:         val,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
 		allDataList = append(allDataList, tmpData)
@@ -374,7 +374,7 @@ func GetChartPredictEdbInfoDataListByRuleHc(edbInfoId int, hcValue float64, star
 			EdbInfoId:     edbInfoId,
 			DataTime:      currentDateStr,
 			Value:         val,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
 		allDataList = append(allDataList, tmpData)
@@ -451,7 +451,7 @@ func GetChartPredictEdbInfoDataListByRuleNMoveMeanValue(edbInfoId int, nValue in
 			EdbInfoId:     edbInfoId,
 			DataTime:      currentDateStr,
 			Value:         val,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
 		allDataList = append(allDataList, tmpData)
@@ -524,7 +524,7 @@ func GetChartPredictEdbInfoDataListByRuleNLinearRegression(edbInfoId int, nValue
 			EdbInfoId:     edbInfoId,
 			DataTime:      currentDateStr,
 			Value:         val,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
 		allDataList = append(allDataList, tmpData)
@@ -640,7 +640,7 @@ func GetChartPredictEdbInfoDataListByRuleTrendsHC(edbInfoId, configId int, start
 			EdbInfoId:     edbInfoId,
 			DataTime:      currentDateStr,
 			Value:         val,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
 		allDataList = append(allDataList, tmpData)
@@ -707,7 +707,7 @@ func GetChartPredictEdbInfoDataListByRuleFinalValueHc(edbInfoId int, finalValue
 			EdbInfoId:     edbInfoId,
 			DataTime:      currentDateStr,
 			Value:         val,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
 		allDataList = append(allDataList, tmpData)
@@ -893,7 +893,7 @@ func GetChartPredictEdbInfoDataListByRuleSeason(edbInfoId int, yearsList []int,
 			EdbInfoId:     edbInfoId,
 			DataTime:      currentDateStr,
 			Value:         val,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
 		allDataList = append(allDataList, tmpData)
@@ -1061,7 +1061,7 @@ func GetChartPredictEdbInfoDataListByRuleMoveAverageTb(edbInfoId int, nValue, ye
 			EdbInfoId:     edbInfoId,
 			DataTime:      currentDateStr,
 			Value:         val,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
 		allDataList = append(allDataList, tmpData)
@@ -1180,7 +1180,7 @@ func GetChartPredictEdbInfoDataListByRuleTbzscz(edbInfoId int, tbEndValue float6
 			EdbInfoId: edbInfoId,
 			DataTime:  currentDate.Format(utils.FormatDate),
 			//Value:         dataValue,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 
 		var val float64
@@ -1306,7 +1306,7 @@ func GetChartPredictEdbInfoDataListByRuleLineNh(edbInfoId int, dayList []time.Ti
 			EdbInfoId:     edbInfoId,
 			DataTime:      currentDateStr,
 			Value:         val,
-			DataTimestamp: (currentDate.UnixNano() / 1e6) + 1000, //前端需要让加1s，说是2022-09-01 00:00:00 这样的整点不合适
+			DataTimestamp: currentDate.UnixNano() / 1e6,
 		}
 		newPredictEdbInfoData = append(newPredictEdbInfoData, tmpData)
 		allDataList = append(allDataList, tmpData)