From b270a07828a9627f1a42e254a430c9921fec4e95 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 26 三月 2025 16:14:37 +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/sample/SampleInfoConstructor.java | 4 ++--
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
index af4ae5b..430c810 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
@@ -81,7 +81,7 @@
dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
break;
case PLAN:
- dateTime = calculateTime(originalTime, true, columnItem.getDataLength() + 1, columnItem.getGranularity());
+ dateTime = originalTime;
break;
case IND:
case IND_ASCII:
@@ -114,7 +114,7 @@
dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
break;
case PLAN:
- dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
+ dateTime = calculateTime(originalTime, false, columnItem.getDataLength()-1, columnItem.getGranularity());
break;
case IND:
case IND_ASCII:
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java
index bdc4272..69f6930 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MdkController.java
@@ -137,7 +137,10 @@
return error(GlobalErrorCodeConstants.BAD_REQUEST.getCode(),"模型设置错误，请检查！");
}
+ log.info("#######################测试运行模型 " + dto.getPyName() + " ##########################");
+ log.info("参数： " + JSON.toJSONString(paramsValueArray));
HashMap result = (HashMap) clazz.getDeclaredMethod(dto.getMethodName(), paramsArray).invoke(clazz.newInstance(), paramsValueArray);
+ log.info("model test run result:" + result);
return success(JSON.toJSONString(result));
} catch (Exception ex) {
ex.printStackTrace();
--
Gitblit v1.9.3