From e54ce4959bca1fdeda01701989f8debd9467d4bd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 03 一月 2025 10:08:20 +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/schedule/impl/ScheduleModelHandlerImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 bf9930d..bb0707a 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
@@ -52,7 +52,7 @@
private SampleConstructor sampleConstructor;
@Override
- public ScheduleResultVO doSchedule(String schemeCode, Date scheduleTime, Map<Integer, Integer> dynamicDataLength) throws ModelInvokeException {
+ public ScheduleResultVO doSchedule(String schemeCode, Date scheduleTime, Map<Integer, Integer> dynamicDataLength, Map<String, Object> params) throws ModelInvokeException {
ScheduleResultVO scheduleResult = new ScheduleResultVO();
StScheduleSchemeEntity scheduleScheme = stScheduleSchemeService.getByCode(schemeCode);
StScheduleModelEntity scheduleModel = stScheduleModelService.get(scheduleScheme.getModelId());
@@ -78,6 +78,14 @@
log.error("模型setting不存在，modelId=" + modelId);
return null;
}
+ //如果输入参数中包含setting，则覆盖默认的setting
+ if (!params.isEmpty()){
+ for (Map.Entry<String, Object> entry : params.entrySet()){
+ if (settings.containsKey(entry.getKey())){
+ settings.put(entry.getKey(), entry.getValue());
+ }
+ }
+ }
// 校验setting必须有pyFile，否则可能导致程序崩溃
if (!settings.containsKey(MdkConstant.PY_FILE_KEY)) {
log.error("模型设置参数缺少必要信息【" + MdkConstant.PY_FILE_KEY + "】,请重新上传模型！");
--
Gitblit v1.9.3