From dfceba5626e95a5d12faa5a4e2bee9408c464ec3 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 25 十二月 2024 10:43:59 +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 |   10 ++++------
 1 files changed, 4 insertions(+), 6 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 8603b8f..cc8681b 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
@@ -89,7 +89,7 @@
             param2Values[portLength] = newModelBean.getDataMap().get("models");
             param2Values[portLength + 1] = settings;
 
-            log.info("####################### 预测模型 "+ "【itemId:" + predictModel.getItemid() + ",itemName" + itemName + ",itemNo" + itemNo + "】 ##########################");
+            log.info("####################### 预测模型 "+ "【itemId:" + predictModel.getItemid() + ",itemName:" + itemName + ",itemNo:" + itemNo + "】 ##########################");
 //            JSONObject jsonObjNewModelBean = new JSONObject();
 //            jsonObjNewModelBean.put("newModelBean", newModelBean);
 //            log.info(String.valueOf(jsonObjNewModelBean));
@@ -99,16 +99,14 @@
 
             //IAILMDK.run
             HashMap<String, Object> modelResult = DllUtils.run(newModelBean, param2Values, predictModel.getMpkprojectid());
+            //打印结果
+            log.info("预测模型计算完成:modelId=" + modelId + ",modelName=" + predictModel.getMethodname() + ",modelResult=" + JSON.toJSONString(modelResult));
+            //判断模型结果
             if (!modelResult.containsKey(CommonConstant.MDK_STATUS_CODE) || !modelResult.containsKey(CommonConstant.MDK_RESULT) ||
                     !modelResult.get(CommonConstant.MDK_STATUS_CODE).toString().equals(CommonConstant.MDK_STATUS_100)) {
                 throw new ModelResultErrorException("模型结果异常:" + modelResult);
             }
             modelResult = (HashMap<String, Object>) modelResult.get(CommonConstant.MDK_RESULT);
-            //打印结果
-//            log.info("预测模型计算完成:modelId=" + modelId + ",modelName" + predictModel.getMethodname());
-            JSONObject jsonObjResult = new JSONObject();
-            jsonObjResult.put("result", modelResult);
-            log.info("预测模型计算完成:modelId=" + modelId + ",modelName" + predictModel.getMethodname() + "modelResult" + String.valueOf(jsonObjResult));
 
             List<MmItemOutputEntity> itemOutputList = mmItemOutputService.getByItemid(predictModel.getItemid());
             Map<MmItemOutputEntity, double[]> predictMatrixs = new HashMap<>();

--
Gitblit v1.9.3