From 37e7e2cca71cd35db3e3de71619cc2e0173f3789 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 11 Dec 2024 12:31:02 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95-=E9=80=9A=E8=BF=87=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BD=9C=E4=B8=9A=EF=BC=8C=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=97=B6=E6=B2=A1=E6=9C=89=E6=A0=B9=E6=8D=AE=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=98=A0=E5=B0=84=E5=80=BC=E5=88=86=E9=85=8D?=
 =?UTF-8?q?runner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1307939220979712]服务目录-通过服务发起作业，保存时没有根据作业参数映射值分配runner http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1307939220979712
---
 .../service/AutoexecServiceServiceImpl.java     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java
index 87858eef..b0fc9240 100644
--- a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java
+++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java
@@ -527,6 +527,20 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService {
             builder.setScenarioId(scenarioId);
         }
 
+        AutoexecCombopExecuteConfigVo combopExecuteConfig = versionConfigVo.getExecuteConfig();
+        if (combopExecuteConfig != null) {
+            // 执行器组
+            ParamMappingVo runnerGroup = combopExecuteConfig.getRunnerGroup();
+            if (runnerGroup != null) {
+                builder.setRunnerGroup(runnerGroup);
+            }
+
+            // 执行器组标签
+            ParamMappingVo runnerGroupTag = combopExecuteConfig.getRunnerGroupTag();
+            if (runnerGroupTag != null) {
+                builder.setRunnerGroupTag(runnerGroupTag);
+            }
+        }
         autoexecCombopService.needExecuteConfig(autoexecCombopVersionVo);
         boolean needExecuteUser = autoexecCombopVersionVo.getNeedExecuteUser();
         boolean needExecuteNode = autoexecCombopVersionVo.getNeedExecuteNode();
@@ -663,6 +677,9 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService {
                             }
                         }
                     }
+                    if (MapUtils.isNotEmpty(runtimeParamMap)) {
+                        param.putAll(runtimeParamMap);
+                    }
                     for (AutoexecParamVo autoexecParamVo : lastRuntimeParamList) {
                         if (param.containsKey(autoexecParamVo.getKey())) {
                             continue;
-- 
Gitee