From 28436c19c6058fd0c1581c880b4ca29bfa0d3ecd Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 28 Aug 2025 15:42:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B5=81=E6=B0=B4=E7=BA=BF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=97=B6=E9=A2=84=E7=BD=AE=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=9B=86=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1497859101261824]应用配置流水线信息回显时预置参数集数据不全 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1497859101261824 --- .../apppipeline/GetDeployAppPipelineApi.java | 1 + .../util/DeployPipelineConfigManager.java | 40 ++++++++++++++----- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java b/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java index a28bf64d..9339bf80 100644 --- a/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java +++ b/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java @@ -66,6 +66,7 @@ public class GetDeployAppPipelineApi extends PrivateApiComponentBase { @Override public Object myDoService(JSONObject paramObj) throws Exception { DeployAppConfigVo searchVo = paramObj.toJavaObject(DeployAppConfigVo.class); + searchVo.setId(-1L); IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); ResourceVo appSystem = resourceCrossoverMapper.getAppSystemById(searchVo.getAppSystemId()); if (appSystem == null) { diff --git a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java index 03836a84..ec9d8b61 100644 --- a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java +++ b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java @@ -580,18 +580,38 @@ public class DeployPipelineConfigManager { if (phaseConfigVo == null) { continue; } - List combopPhaseOperationList = phaseConfigVo.getPhaseOperationList(); - if (CollectionUtils.isEmpty(combopPhaseOperationList)) { - continue; - } + profileIdSet.addAll(getProfileIdSet(phaseConfigVo.getPhaseOperationList())); +// List combopPhaseOperationList = phaseConfigVo.getPhaseOperationList(); +// if (CollectionUtils.isEmpty(combopPhaseOperationList)) { +// continue; +// } +// for (AutoexecCombopPhaseOperationVo combopPhaseOperationVo : combopPhaseOperationList) { +// AutoexecCombopPhaseOperationConfigVo operationConfigVo = combopPhaseOperationVo.getConfig(); +// if (operationConfigVo == null) { +// continue; +// } +// Long profileId = operationConfigVo.getProfileId(); +// if (profileId != null) { +// profileIdSet.add(profileId); +// } +// } + } + return profileIdSet; + } + + private static Set getProfileIdSet(List combopPhaseOperationList) { + Set profileIdSet = new HashSet<>(); + if (CollectionUtils.isNotEmpty(combopPhaseOperationList)) { for (AutoexecCombopPhaseOperationVo combopPhaseOperationVo : combopPhaseOperationList) { AutoexecCombopPhaseOperationConfigVo operationConfigVo = combopPhaseOperationVo.getConfig(); - if (operationConfigVo == null) { - continue; - } - Long profileId = operationConfigVo.getProfileId(); - if (profileId != null) { - profileIdSet.add(profileId); + if (operationConfigVo != null) { + Long profileId = operationConfigVo.getProfileId(); + if (profileId != null) { + profileIdSet.add(profileId); + } + profileIdSet.addAll(getProfileIdSet(operationConfigVo.getIfList())); + profileIdSet.addAll(getProfileIdSet(operationConfigVo.getElseList())); + profileIdSet.addAll(getProfileIdSet(operationConfigVo.getOperations())); } } } -- Gitee