From 9b445c66fcc4b5870476a591c006d665f08ba915 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 十二月 2024 11:59:06 +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/PredictModelHandlerImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java
index f2c3cef..6ec3e55 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/impl/PredictModelHandlerImpl.java
@@ -6,6 +6,7 @@
import com.iail.model.IAILModel;
import com.iailab.module.model.common.enums.CommonConstant;
import com.iailab.module.model.common.enums.OutResultType;
+import com.iailab.module.model.common.exception.ModelResultErrorException;
import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
import com.iailab.module.model.mcs.pre.entity.MmModelArithSettingsEntity;
import com.iailab.module.model.mcs.pre.entity.MmPredictModelEntity;
@@ -56,14 +57,14 @@
* @throws ModelInvokeException
*/
@Override
- public synchronized PredictResultVO predictByModel(Date predictTime, MmPredictModelEntity predictModel,String itemName, ItemRunStatusEnum itemRunStatusEnum) throws ModelInvokeException {
+ public synchronized PredictResultVO predictByModel(Date predictTime, MmPredictModelEntity predictModel,String itemName) throws ModelInvokeException {
PredictResultVO result = new PredictResultVO();
if (predictModel == null) {
throw new ModelInvokeException("modelEntity is null");
}
String modelId = predictModel.getId();
try {
- List<SampleData> sampleDataList = sampleConstructor.constructSample(TypeA.Predict.name(), modelId, predictTime);
+ List<SampleData> sampleDataList = sampleConstructor.constructSample(TypeA.Predict.name(), modelId, predictTime, itemName);
String modelPath = predictModel.getModelpath();
if (modelPath == null) {
log.info("模型路径不存在，modelId=" + modelId);
@@ -100,8 +101,7 @@
HashMap<String, Object> modelResult = DllUtils.run(newModelBean, param2Values, predictModel.getMpkprojectid());
if (!modelResult.containsKey(CommonConstant.MDK_STATUS_CODE) || !modelResult.containsKey(CommonConstant.MDK_RESULT) ||
!modelResult.get(CommonConstant.MDK_STATUS_CODE).toString().equals(CommonConstant.MDK_STATUS_100)) {
- itemRunStatusEnum = ItemRunStatusEnum.MODELRESULTERROR;
- throw new RuntimeException("模型结果异常：" + modelResult);
+ throw new ModelResultErrorException("模型结果异常：" + modelResult);
}
modelResult = (HashMap<String, Object>) modelResult.get(CommonConstant.MDK_RESULT);
//打印结果
@@ -143,8 +143,11 @@
result.setPredictDoubleValues(predictDoubleValues);
result.setModelResult(modelResult);
result.setPredictTime(predictTime);
+ } catch (ModelResultErrorException ex) {
+ ex.printStackTrace();
+ throw ex;
} catch (Exception ex) {
- log.error("调用发生异常，异常信息为:{}", ex);
+// log.error("调用发生异常，异常信息为:{0}", ex.getMessage());
ex.printStackTrace();
throw new ModelInvokeException(ex.getMessage());
}
--
Gitblit v1.9.3