From 8ffbde1bd68f81541e26970bc0e1d578e5c695bf Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 08 十一月 2024 17:51:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java
index e69b1e7..ca8d21a 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java
@@ -2,7 +2,7 @@
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.data.api.point.dto.ApiPointDTO;
-import com.iailab.module.data.enums.DataPointFreq;
+import com.iailab.module.data.enums.DataPointFreqEnum;
import com.iailab.module.model.mcs.pre.service.MmItemResultService;
import com.iailab.module.model.mdk.factory.ItemEntityFactory;
import com.iailab.module.model.mdk.vo.MmItemOutputVO;
@@ -32,7 +32,7 @@
* @param predictResult
* @return
*/
- private Map<String, List<DataValueVO>> convertToPredictData(PredictResultVO predictResult) {
+ public Map<String, List<DataValueVO>> convertToPredictData(PredictResultVO predictResult) {
Map<String, List<DataValueVO>> resultMap = new HashMap<>();
List<MmItemOutputVO> itemOutPutList = itemEntityFactory.getOutPutByItemId(predictResult.getPredictId());
@@ -40,7 +40,7 @@
resultMap.put(itemOutPutList.get(0).getId(), predictResult.getPredictList());
return resultMap;
}
- ApiPointDTO point = dataPointApi.getPointById(itemOutPutList.get(0).getPointId());
+ ApiPointDTO point = dataPointApi.getInfoById(itemOutPutList.get(0).getPointId());
List<Date> dateTimeList = new ArrayList<>();
Integer rows = predictResult.getPredictMatrix().length;
Integer columns = predictResult.getPredictMatrix()[0].length;
@@ -49,7 +49,7 @@
dateTimeList.add(tempTime);
Calendar calendar = Calendar.getInstance();
calendar.setTime(tempTime);
- calendar.add(Calendar.SECOND, DataPointFreq.getEumByCode(point.getMinfreqid()).getValue());
+ calendar.add(Calendar.SECOND, DataPointFreqEnum.getEumByCode(point.getMinfreqid()).getValue());
tempTime = calendar.getTime();
}
for (Integer i = 0; i < columns; i++) {
--
Gitblit v1.9.3