From b3674cefbeb8ffaf49f96d0c8fe7a6694ed86eec Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 25 二月 2025 15:05:32 +0800
Subject: [PATCH] 模拟调整 远程调用
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java | 80 ++++++++++++++++++++++++++++++---------
1 files changed, 61 insertions(+), 19 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 8bc9517..ebaee0f 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
@@ -1,20 +1,18 @@
package com.iailab.module.model.mdk.predict;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.iailab.module.data.api.point.DataPointApi;
-import com.iailab.module.data.api.point.dto.ApiPointDTO;
-import com.iailab.module.data.enums.DataPointFreqEnum;
+import com.iailab.module.model.common.enums.CommonDict;
import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
import com.iailab.module.model.mcs.pre.service.MmItemResultService;
+import com.iailab.module.model.mcs.sche.service.StAdjustResultService;
import com.iailab.module.model.mdk.factory.ItemEntityFactory;
import com.iailab.module.model.mdk.vo.DataValueVO;
-import com.iailab.module.model.mdk.vo.MmItemOutputVO;
import com.iailab.module.model.mdk.vo.PredictResultVO;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.*;
@Service
@@ -26,7 +24,7 @@
private ItemEntityFactory itemEntityFactory;
@Autowired
- private DataPointApi dataPointApi;
+ private StAdjustResultService stAdjustResultService;
/**
* convertToPredictData
@@ -36,17 +34,9 @@
*/
public Map<String, List<DataValueVO>> convertToPredictData(PredictResultVO predictResult) {
Map<String, List<DataValueVO>> resultMap = new HashMap<>();
- List<MmItemOutputVO> itemOutPutList = itemEntityFactory.getOutPutByItemId(predictResult.getPredictId());
-
- if (!CollectionUtils.isEmpty(predictResult.getPredictList())) {
- resultMap.put(itemOutPutList.get(0).getId(), predictResult.getPredictList());
- return resultMap;
- }
Map<MmItemOutputEntity, double[]> predictMatrixs = predictResult.getPredictMatrixs();
- HashMap<String,List<DataValueVO>> predictLists = new HashMap<>();
+ HashMap<String, List<DataValueVO>> predictLists = new HashMap<>();
for (Map.Entry<MmItemOutputEntity, double[]> entry : predictMatrixs.entrySet()) {
- ApiPointDTO point = dataPointApi.getInfoById(entry.getKey().getPointid());
- Integer pointMinfreq = DataPointFreqEnum.getEumByCode(point.getMinfreqid()).getValue();
Integer rows = entry.getValue().length;
List<DataValueVO> predictDataList = new ArrayList<>();
Calendar calendar = Calendar.getInstance();
@@ -57,12 +47,54 @@
predictData.setDataValue(Double.valueOf(entry.getValue()[i]));
predictDataList.add(predictData);
- calendar.add(Calendar.SECOND, pointMinfreq);
+ calendar.add(Calendar.SECOND, predictResult.getGranularity());
}
resultMap.put(entry.getKey().getId(), predictDataList);
+ predictLists.put(entry.getKey().getResultstr(), predictDataList);
+
+ //处理累计计算
+ if (entry.getKey().getIscumulant() == 1) {
+ resultMap.put(entry.getKey().getId() + CommonDict.CUMULANT_SUFFIX, new ArrayList<DataValueVO>() {{
+ DataValueVO predictData = new DataValueVO();
+ // 时间 预测时间+预测长度*粒度
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(predictResult.getPredictTime());
+ calendar.add(Calendar.SECOND, predictResult.getGranularity() * (rows - 1));
+ predictData.setDataTime(calendar.getTime());
+ //值 所有值相加/除数
+ BigDecimal sum = BigDecimal.valueOf(Arrays.stream(entry.getValue()).sum());
+ BigDecimal divisor = BigDecimal.valueOf(entry.getKey().getCumuldivisor());
+ predictData.setDataValue(sum.divide(divisor, 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+ add(predictData);
+ }});
+ }
}
predictResult.setPredictLists(predictLists);
return resultMap;
+ }
+
+ public Map<String, List<DataValueVO>> convertToPredictData2(PredictResultVO predictResult) {
+ Map<String, List<DataValueVO>> predictLists = new HashMap<>();
+ if (!CollectionUtils.isEmpty(predictResult.getPredictList())) {
+ return predictLists;
+ }
+ Map<MmItemOutputEntity, double[]> predictMatrixs = predictResult.getPredictMatrixs();
+ for (Map.Entry<MmItemOutputEntity, double[]> entry : predictMatrixs.entrySet()) {
+ Integer rows = entry.getValue().length;
+ List<DataValueVO> predictDataList = new ArrayList<>();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(predictResult.getPredictTime());
+ for (Integer i = 0; i < rows; i++) {
+ DataValueVO predictData = new DataValueVO();
+ predictData.setDataTime(calendar.getTime());
+ predictData.setDataValue(Double.valueOf(entry.getValue()[i]));
+ predictDataList.add(predictData);
+
+ calendar.add(Calendar.SECOND, predictResult.getGranularity());
+ }
+ predictLists.put(entry.getKey().getResultstr(), predictDataList);
+ }
+ return predictLists;
}
/**
@@ -70,21 +102,31 @@
*
* @param predictResult
*/
- @Async
@DSTransactional
public void savePredictResult(PredictResultVO predictResult) {
Map<String, List<DataValueVO>> resultMap = convertToPredictData(predictResult);
mmItemResultService.savePredictValue(resultMap, predictResult.getLt(), "n", predictResult.getPredictTime());
}
+ /**
+ * savePredictAdjustResult
+ *
+ * @param predictResult
+ */
+ @DSTransactional
+ public void savePredictAdjustResult(PredictResultVO predictResult, String adjustValue, String scheduleModelId) {
+ Map<String, List<DataValueVO>> resultMap = convertToPredictData(predictResult);
+ stAdjustResultService.saveResult(resultMap, predictResult.getPredictTime(), adjustValue, scheduleModelId);
+ }
+
public List<DataValueVO> getPredictValueByItemNo(String itemNo, Date start, Date end) {
String itemId = itemEntityFactory.getItemByItemNo(itemNo).getId();
- List<MmItemOutputVO> outputList = itemEntityFactory.getOutPutByItemId(itemId);
+ List<MmItemOutputEntity> outputList = itemEntityFactory.getOutPutByItemId(itemId);
return mmItemResultService.getPredictValue(outputList.get(0).getId(), start, end);
}
public List<DataValueVO> getPredictValueByItemId(String itemId, Date start, Date end) {
- List<MmItemOutputVO> outputList = itemEntityFactory.getOutPutByItemId(itemId);
+ List<MmItemOutputEntity> outputList = itemEntityFactory.getOutPutByItemId(itemId);
return mmItemResultService.getPredictValue(outputList.get(0).getId(), start, end);
}
}
--
Gitblit v1.9.3