From df88dcb43f7a3219b4a53b47123e82f9e9bbea2f Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 30 Jun 2025 14:19:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=9C=8D=E5=8A=A1=E7=9A=84=E5=88=86?= =?UTF-8?q?=E6=89=B9=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=B9=B6=E5=8F=91=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E4=B8=BA=E2=80=9C=E5=88=86=E6=89=B9=E2=80=9D=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=9C=8D=E5=8A=A1=E5=A7=8B=E7=BB=88=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1454951463616512]目录管理-服务的分批设置的并发策略为“分批”时，服务始终失效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1454951463616512 --- .../service/AutoexecServiceServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java index 1225c30d..ceee9e61 100644 --- a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java +++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java @@ -147,7 +147,7 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService { } if (versionVo.getNeedRoundCount()) { ParamMappingVo parallelPolicy = serviceConfigVo.getParallelPolicy(); - if (Objects.equals(parallelPolicy.getValue(), AutoexecParallelPolicy.ROUND_COUNT.getValue())) { + if (parallelPolicy != null && Objects.equals(parallelPolicy.getValue(), AutoexecParallelPolicy.ROUND_COUNT.getValue())) { ParamMappingVo roundCountMappingVo = serviceConfigVo.getRoundCount(); if (roundCountMappingVo == null) { if (throwException) { @@ -885,11 +885,13 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService { AutoexecCombopExecuteConfigVo executeConfig = versionConfig.getExecuteConfig(); if (executeConfig != null) { if (autoexecCombopVersionVo.getNeedRoundCount()) { - if (executeConfig.getRoundCount() != null) { - ParamMappingVo roundCount = new ParamMappingVo(); - roundCount.setMappingMode(ParamMappingMode.CONSTANT.getValue()); - roundCount.setValue(executeConfig.getRoundCount()); - config.setRoundCount(roundCount); + if (config.getRoundCount() == null) { + if (executeConfig.getRoundCount() != null) { + ParamMappingVo roundCount = new ParamMappingVo(); + roundCount.setMappingMode(ParamMappingMode.CONSTANT.getValue()); + roundCount.setValue(executeConfig.getRoundCount()); + config.setRoundCount(roundCount); + } } } else { config.setRoundCount(null); -- Gitee From 3a448ce1a1436eb778d2dce94d643e8c3568fbb5 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 30 Jun 2025 14:25:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=9C=8D=E5=8A=A1=E7=9A=84=E5=88=86?= =?UTF-8?q?=E6=89=B9=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=B9=B6=E5=8F=91=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E4=B8=BA=E2=80=9C=E5=88=86=E6=89=B9=E2=80=9D=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=9C=8D=E5=8A=A1=E5=A7=8B=E7=BB=88=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1454951463616512]目录管理-服务的分批设置的并发策略为“分批”时，服务始终失效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1454951463616512 --- .../api/service/GetAutoexecServiceApi.java | 4 ++++ .../service/AutoexecServiceServiceImpl.java | 14 ++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/api/service/GetAutoexecServiceApi.java b/src/main/java/neatlogic/module/autoexec/api/service/GetAutoexecServiceApi.java index d6bac02a..8bfaae19 100644 --- a/src/main/java/neatlogic/module/autoexec/api/service/GetAutoexecServiceApi.java +++ b/src/main/java/neatlogic/module/autoexec/api/service/GetAutoexecServiceApi.java @@ -101,6 +101,10 @@ public class GetAutoexecServiceApi extends PrivateApiComponentBase { reasonObj.put("reasonList", reasonList); serviceVo.setConfigExpiredReason(reasonObj); autoexecServiceMapper.updateServiceConfigExpiredById(serviceVo); + } else { + serviceVo.setConfigExpired(0); + serviceVo.setConfigExpiredReason(null); + autoexecServiceMapper.updateServiceConfigExpiredById(serviceVo); } } return serviceVo; diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java index ceee9e61..1225c30d 100644 --- a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java +++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java @@ -147,7 +147,7 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService { } if (versionVo.getNeedRoundCount()) { ParamMappingVo parallelPolicy = serviceConfigVo.getParallelPolicy(); - if (parallelPolicy != null && Objects.equals(parallelPolicy.getValue(), AutoexecParallelPolicy.ROUND_COUNT.getValue())) { + if (Objects.equals(parallelPolicy.getValue(), AutoexecParallelPolicy.ROUND_COUNT.getValue())) { ParamMappingVo roundCountMappingVo = serviceConfigVo.getRoundCount(); if (roundCountMappingVo == null) { if (throwException) { @@ -885,13 +885,11 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService { AutoexecCombopExecuteConfigVo executeConfig = versionConfig.getExecuteConfig(); if (executeConfig != null) { if (autoexecCombopVersionVo.getNeedRoundCount()) { - if (config.getRoundCount() == null) { - if (executeConfig.getRoundCount() != null) { - ParamMappingVo roundCount = new ParamMappingVo(); - roundCount.setMappingMode(ParamMappingMode.CONSTANT.getValue()); - roundCount.setValue(executeConfig.getRoundCount()); - config.setRoundCount(roundCount); - } + if (executeConfig.getRoundCount() != null) { + ParamMappingVo roundCount = new ParamMappingVo(); + roundCount.setMappingMode(ParamMappingMode.CONSTANT.getValue()); + roundCount.setValue(executeConfig.getRoundCount()); + config.setRoundCount(roundCount); } } else { config.setRoundCount(null); -- Gitee