From 6205c22a959fbb3b69735f34af8d3316c4082a5d Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 27 二月 2025 16:00: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/impl/PredictItemNormalHandlerImpl.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictItemNormalHandlerImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictItemNormalHandlerImpl.java
index cb54cce..6fdf115 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictItemNormalHandlerImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictItemNormalHandlerImpl.java
@@ -1,5 +1,6 @@
package com.iailab.module.model.mdk.predict.impl;
+import com.iailab.module.model.common.exception.ModelResultErrorException;
import com.iailab.module.model.mcs.pre.entity.MmPredictModelEntity;
import com.iailab.module.model.mcs.pre.enums.ItemRunStatusEnum;
import com.iailab.module.model.mcs.pre.service.MmPredictModelService;
@@ -9,11 +10,13 @@
import com.iailab.module.model.mdk.predict.PredictModelHandler;
import com.iailab.module.model.mdk.vo.ItemVO;
import com.iailab.module.model.mdk.vo.PredictResultVO;
+import com.iailab.module.model.mdk.vo.StAdjustDeviationDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.text.MessageFormat;
import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
@@ -39,7 +42,7 @@
* @throws ItemInvokeException
*/
@Override
- public PredictResultVO predict(Date predictTime, ItemVO predictItemDto, Map<String, double[]> predictValueMap, ItemRunStatusEnum itemRunStatusEnum) throws ItemInvokeException {
+ public PredictResultVO predict(Date predictTime, ItemVO predictItemDto, Map<String, double[]> predictValueMap) throws ItemInvokeException,ModelResultErrorException {
PredictResultVO predictResult = new PredictResultVO();
String itemId = predictItemDto.getId();
try {
@@ -48,8 +51,39 @@
throw new ModelInvokeException(MessageFormat.format("{0},itemId={1}",
ModelInvokeException.errorGetModelEntity, itemId));
}
- predictResult = predictModelHandler.predictByModel(predictTime, predictModel,predictItemDto.getItemName(),itemRunStatusEnum);
+ predictResult = predictModelHandler.predictByModel(predictTime, predictModel,predictItemDto.getItemName(),predictItemDto.getItemNo());
predictResult.setPredictId(itemId);
+ } catch (ModelResultErrorException ex) {
+ throw ex;
+ } catch (Exception ex) {
+ throw new ItemInvokeException(MessageFormat.format("{0},itemId={1}",
+ ItemInvokeException.errorItemFailed, itemId));
+ }
+ return predictResult;
+ }
+
+ /**
+ * NormalItem预测
+ *
+ * @param predictTime
+ * @param predictItemDto
+ * @return
+ * @throws ItemInvokeException
+ */
+ @Override
+ public PredictResultVO predictAdjust(Date predictTime, ItemVO predictItemDto, List<StAdjustDeviationDTO> deviationList) throws ItemInvokeException,ModelResultErrorException {
+ PredictResultVO predictResult = new PredictResultVO();
+ String itemId = predictItemDto.getId();
+ try {
+ MmPredictModelEntity predictModel = mmPredictModelService.getActiveModelByItemId(itemId);
+ if (predictModel == null) {
+ throw new ModelInvokeException(MessageFormat.format("{0},itemId={1}",
+ ModelInvokeException.errorGetModelEntity, itemId));
+ }
+ predictResult = predictModelHandler.predictByModel(predictTime, predictModel,predictItemDto.getItemName(),predictItemDto.getItemNo(), deviationList);
+ predictResult.setPredictId(itemId);
+ } catch (ModelResultErrorException ex) {
+ throw ex;
} catch (Exception ex) {
throw new ItemInvokeException(MessageFormat.format("{0},itemId={1}",
ItemInvokeException.errorItemFailed, itemId));
--
Gitblit v1.9.3