From c204b31aa0926462cc5eda2ba504b10e04b530eb Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 03 十二月 2024 15:30:13 +0800
Subject: [PATCH] 调度模型 运行

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/schedule/impl/ScheduleModelHandlerImpl.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/schedule/impl/ScheduleModelHandlerImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/schedule/impl/ScheduleModelHandlerImpl.java
index 3905e29..48a5efb 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/schedule/impl/ScheduleModelHandlerImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/schedule/impl/ScheduleModelHandlerImpl.java
@@ -90,7 +90,7 @@
             param2Values[count] = settings_predict;
 
             //打印参数
-            log.info("##############调度模型:modelId=" + modelId + " ##########################");
+            log.info("##############调度模型:scheduleScheme=" + scheduleScheme.getCode() + " ##########################");
             JSONObject jsonObjNewModelBean = new JSONObject();
             jsonObjNewModelBean.put("newModelBean", newModelBean);
             log.info(String.valueOf(jsonObjNewModelBean));
@@ -98,23 +98,21 @@
             jsonObjParam2Values.put("param2Values", param2Values);
             log.info(String.valueOf(jsonObjParam2Values));
 
-            //IAILMDK.run
-            HashMap<String, Object> result = IAILMDK.run(newModelBean, param2Values);
-            /*HashMap<String, Object> modelResult = DllUtils.run(newModelBean, param2Values, predictModel.getMpkprojectid());
+            //运行模型
+            HashMap<String, Object> modelResult = DllUtils.run(newModelBean, param2Values, scheduleScheme.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)) {
                 throw new RuntimeException("模型结果异常:" + modelResult);
             }
-            modelResult = (HashMap<String, Object>) modelResult.get(CommonConstant.MDK_RESULT);*/
+            modelResult = (HashMap<String, Object>) modelResult.get(CommonConstant.MDK_RESULT);
 
             //打印结果
             JSONObject jsonObjResult = new JSONObject();
-            jsonObjResult.put("result", result);
+            jsonObjResult.put("result", modelResult);
             log.info(String.valueOf(jsonObjResult));
-            log.info("调度模型计算完成:modelId=" + modelId + result);
 
             //5.返回调度结果
-            scheduleResult.setResult(result);
+            scheduleResult.setResult(modelResult);
             scheduleResult.setModelId(modelId);
             scheduleResult.setSchemeId(scheduleScheme.getId());
             scheduleResult.setScheduleTime(scheduleTime);

--
Gitblit v1.9.3