From 0cbbe2c1cbfbf73e02e1796d921c2911c96d370b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 11:46:31 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictItemNormalHandlerImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 855794b..025ce4e 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,6 +1,7 @@
package com.iailab.module.model.mdk.predict.impl;
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;
import com.iailab.module.model.mdk.common.exceptions.ItemInvokeException;
import com.iailab.module.model.mdk.common.exceptions.ModelInvokeException;
@@ -13,6 +14,7 @@
import java.text.MessageFormat;
import java.util.Date;
+import java.util.Map;
/**
* @author PanZhibao
@@ -37,17 +39,17 @@
* @throws ItemInvokeException
*/
@Override
- public PredictResultVO predict(Date predictTime, ItemVO predictItemDto) throws ItemInvokeException {
+ public PredictResultVO predict(Date predictTime, ItemVO predictItemDto, Map<String, double[]> predictValueMap) throws ItemInvokeException {
PredictResultVO predictResult = new PredictResultVO();
String itemId = predictItemDto.getId();
- predictResult.setPredictId(itemId);
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);
+ predictResult = predictModelHandler.predictByModel(predictTime, predictModel,predictItemDto.getItemName());
+ predictResult.setPredictId(itemId);
} catch (Exception ex) {
throw new ItemInvokeException(MessageFormat.format("{0},itemId={1}",
ItemInvokeException.errorItemFailed, itemId));
--
Gitblit v1.9.3