From 5bf42aa9950058f391805e6fb8d7376f4378924b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 16:16:55 +0800
Subject: [PATCH] cumulateHandle.getCurrent
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictModuleHandler.java | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 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..47596e7 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,7 @@
package com.iailab.module.model.mdk.predict;
+import com.iailab.module.model.common.exception.ModelResultErrorException;
+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 +11,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,54 +49,68 @@
* @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) {
+ 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) {
+ PredictResultVO predictResult;
if (!predictItem.getStatus().equals(ItemStatus.STATUS1.getCode())) {
continue;
}
Long totalDur = 0L;
+ ItemRunStatusEnum itemRunStatusEnum = ItemRunStatusEnum.PROCESSING;
try {
- mmItemStatusService.recordStatus(predictItem.getId(), ItemRunStatusEnum.PROCESSING, totalDur, predictTime);
+ mmItemStatusService.recordStatus(predictItem.getId(), itemRunStatusEnum, totalDur, predictTime);
PredictItemHandler predictItemHandler = predictItemFactory.create(predictItem.getId());
long start = System.currentTimeMillis();
try {
// 预测项开始预测
- predictResult = predictItemHandler.predict(predictTime, predictItem);
+ predictResult = predictItemHandler.predict(predictTime, predictItem, predictValueMap);
+ } catch (ModelResultErrorException e) {
+ itemRunStatusEnum = ItemRunStatusEnum.MODELRESULTERROR;
+ continue;
} catch (Exception e) {
- e.printStackTrace();
- log.error(String.valueOf(e));
- mmItemStatusService.recordStatus(predictItem.getId(), ItemRunStatusEnum.FAIL, totalDur, predictTime);
+ itemRunStatusEnum = ItemRunStatusEnum.FAIL;
continue;
}
long end = System.currentTimeMillis();
Long drtPre = end - start;
log.info(MessageFormat.format("预测项：{0}，预测时间：{1}ms", predictItem.getItemName(), drtPre));
totalDur = totalDur + drtPre;
-
predictResult.setGranularity(predictItem.getGranularity());
predictResult.setT(intervalTime);
predictResult.setSaveIndex(predictItem.getSaveIndex());
predictResult.setLt(1);
+ predictResultMap.put(predictItem.getItemNo(), predictResult);
// 保存预测结果
- predictResultHandler.savePredictResult(predictResult);
- long endSave = System.currentTimeMillis();
- Long drtSave = endSave - end;
- log.info(MessageFormat.format("预测项：{0}，保存时间：{1}ms", predictItem.getItemName(),
- drtSave));
- totalDur = totalDur + drtSave;
- mmItemStatusService.recordStatus(predictItem.getId(), ItemRunStatusEnum.SUCCESS, totalDur, predictTime);
- result.put(predictItem.getItemNo(), predictResult);
+ try {
+ predictResultHandler.savePredictResult(predictResult);
+ } catch (Exception e) {
+ itemRunStatusEnum = ItemRunStatusEnum.MODELRESULTSAVEERROR;
+ throw new RuntimeException("模型结果保存异常，result：" + predictResult);
+ }
+ itemRunStatusEnum = ItemRunStatusEnum.SUCCESS;
+// long endSave = System.currentTimeMillis();
+// Long drtSave = endSave - end;
+// log.info(MessageFormat.format("预测项：{0}，保存时间：{1}ms", predictItem.getItemName(),
+// drtSave));
+// totalDur = totalDur + drtSave;
} catch (Exception e) {
e.printStackTrace();
log.error(MessageFormat.format("预测项编号：{0}，预测项名称：{1}，预测失败：{2} 预测时刻：{3}",
predictItem.getId(), predictItem.getItemName(), e.getMessage(), predictTime));
- mmItemStatusService.recordStatus(predictItem.getId(), ItemRunStatusEnum.FAIL, totalDur, predictTime);
+ } finally {
+ mmItemStatusService.recordStatus(predictItem.getId(), itemRunStatusEnum, totalDur, predictTime);
}
}
- return result;
}
}
\ No newline at end of file
--
Gitblit v1.9.3