From 07890ec0dcb75572740f25a29c80f6d7bddb39e0 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 19 十二月 2024 15:45:46 +0800
Subject: [PATCH] 模型运行测点数据获取方式修改 merge预测模型数据获取方式修改
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java
index 9a5f462..391be24 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java
@@ -1,5 +1,6 @@
package com.iailab.module.model.mdk.predict;
+import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
import com.iailab.module.model.mcs.pre.enums.ItemRunStatusEnum;
import com.iailab.module.model.mcs.pre.enums.ItemStatus;
import com.iailab.module.model.mcs.pre.service.MmItemStatusService;
@@ -9,6 +10,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.text.MessageFormat;
import java.time.Duration;
@@ -46,10 +48,18 @@
* @param intervalTime
* @return
*/
- public Map<String, PredictResultVO> predict(List<ItemVO> predictItemList, Date predictTime, int intervalTime) {
- Map<String, PredictResultVO> result = new HashMap<>();
-
- PredictResultVO predictResult = new PredictResultVO();
+ public void predict(List<ItemVO> predictItemList, Date predictTime, int intervalTime,Map<String, PredictResultVO> predictResultMap) {
+ PredictResultVO predictResult;
+ Map<String, double[]> predictValueMap = null;
+ if (!CollectionUtils.isEmpty(predictResultMap)) {
+ // 将predictResultMap处理成Map<outPutId, double[]>
+ predictValueMap = new HashMap<>();
+ for (Map.Entry<String, PredictResultVO> entry : predictResultMap.entrySet()) {
+ for (Map.Entry<MmItemOutputEntity, double[]> mmItemOutputEntityEntry : entry.getValue().getPredictMatrixs().entrySet()) {
+ predictValueMap.put(mmItemOutputEntityEntry.getKey().getId(),mmItemOutputEntityEntry.getValue());
+ }
+ }
+ }
for (ItemVO predictItem : predictItemList) {
if (!predictItem.getStatus().equals(ItemStatus.STATUS1.getCode())) {
continue;
@@ -61,10 +71,10 @@
long start = System.currentTimeMillis();
try {
// 预测项开始预测
- predictResult = predictItemHandler.predict(predictTime, predictItem);
+ predictResult = predictItemHandler.predict(predictTime, predictItem, predictValueMap);
} catch (Exception e) {
- e.printStackTrace();
- log.error(String.valueOf(e));
+// e.printStackTrace();
+// log.error(String.valueOf(e));
mmItemStatusService.recordStatus(predictItem.getId(), ItemRunStatusEnum.FAIL, totalDur, predictTime);
continue;
}
@@ -86,7 +96,7 @@
drtSave));
totalDur = totalDur + drtSave;
mmItemStatusService.recordStatus(predictItem.getId(), ItemRunStatusEnum.SUCCESS, totalDur, predictTime);
- result.put(predictItem.getItemNo(), predictResult);
+ predictResultMap.put(predictItem.getItemNo(), predictResult);
} catch (Exception e) {
e.printStackTrace();
log.error(MessageFormat.format("预测项编号：{0}，预测项名称：{1}，预测失败：{2} 预测时刻：{3}",
@@ -94,6 +104,5 @@
mmItemStatusService.recordStatus(predictItem.getId(), ItemRunStatusEnum.FAIL, totalDur, predictTime);
}
}
- return result;
}
}
\ No newline at end of file
--
Gitblit v1.9.3