From f3f8ed503e24c61f0d7e1b70aa00a2365e10fff0 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 1 Aug 2025 16:15:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E5=88=9B=E5=BB=BA=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E9=A1=B5=E9=9D=A2=E5=A6=82=E6=9E=9C=E6=89=80=E6=9C=89?= =?UTF-8?q?runner=E9=98=B6=E6=AE=B5=E9=83=BD=E8=AE=BE=E7=BD=AE=E4=BA=86?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E7=BB=84=EF=BC=8C=E5=88=99=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=97=B6=E5=80=99=E6=97=A0?= =?UTF-8?q?=E9=9C=80=E8=AE=BE=E7=BD=AE=E6=89=A7=E8=A1=8C=E5=99=A8=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1478301363699712]后端-组合工具创建作业页面如果所有runner阶段都设置了执行器组，则创建作业的时候无需设置执行器组 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1478301363699712 --- .../autoexec/api/combop/AutoexecCombopDetailGetApi.java | 1 + .../autoexec/service/AutoexecCombopServiceImpl.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java b/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java index 1a102bac..ad343acd 100644 --- a/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java +++ b/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java @@ -121,6 +121,7 @@ public class AutoexecCombopDetailGetApi extends PrivateApiComponentBase { autoexecCombopVo.setNeedExecuteUser(autoexecCombopVersionVo.getNeedExecuteUser()); autoexecCombopVo.setNeedProtocol(autoexecCombopVersionVo.getNeedProtocol()); autoexecCombopVo.setNeedRoundCount(autoexecCombopVersionVo.getNeedRoundCount()); + autoexecCombopVo.setNeedRunnerGroup(autoexecCombopVersionVo.getNeedRunnerGroup()); AutoexecCombopConfigVo config = autoexecCombopVo.getConfig(); config.setExecuteConfig(versionConfig.getExecuteConfig()); config.setCombopGroupList(versionConfig.getCombopGroupList()); diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java index 1c79f548..4e00ca20 100644 --- a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java +++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java @@ -901,6 +901,7 @@ public class AutoexecCombopServiceImpl implements AutoexecCombopService, IAutoex boolean needProtocol = autoexecCombopVersionVo.getNeedProtocol(); boolean needExecuteNode = autoexecCombopVersionVo.getNeedExecuteNode(); boolean needRoundCount = autoexecCombopVersionVo.getNeedRoundCount(); + boolean needRunnerGroup = autoexecCombopVersionVo.getNeedRunnerGroup(); AutoexecCombopExecuteConfigVo executeConfigVo = null; if (Objects.equals(AutoexecJobGroupPolicy.GRAYSCALE.getName(), autoexecCombopGroupVo.getPolicy())) { AutoexecCombopGroupConfigVo autoexecCombopGroupConfigVo = autoexecCombopGroupVo.getConfig(); @@ -947,11 +948,18 @@ public class AutoexecCombopServiceImpl implements AutoexecCombopService, IAutoex needRoundCount = true; } } + if (!needRunnerGroup) { + ParamMappingVo runnerGroup = executeConfigVo.getRunnerGroup(); + if (runnerGroup == null || StringUtils.isBlank((String) runnerGroup.getValue())) { + needRunnerGroup = true; + } + } } autoexecCombopVersionVo.setNeedExecuteUser(needExecuteUser); autoexecCombopVersionVo.setNeedExecuteNode(needExecuteNode); autoexecCombopVersionVo.setNeedProtocol(needProtocol); autoexecCombopVersionVo.setNeedRoundCount(needRoundCount); + autoexecCombopVersionVo.setNeedRunnerGroup(needRunnerGroup); } @Override -- Gitee