From 29dba8b4bbdb02b17e722a1a86839455b6dc74e2 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 16 Jul 2025 18:59:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=9B=86=E6=88=90?= =?UTF-8?q?=E5=8F=91=E5=B8=83-=E6=9F=A5=E8=AF=A2=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE=E7=9A=84=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A8=A1=E5=9D=97=E7=8E=AF=E5=A2=83=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1466730218487808]集成发布-查询发布应用配置的应用系统模块环境树 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1466730218487808 --- ...ployAppConfigAppSystemAppModuleEnvApi.java | 39 ++++++++++++------- .../util/DeployPipelineConfigManager.java | 21 +++++----- 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java index de8d5517..03f40510 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java @@ -14,9 +14,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; +import java.util.*; @Service @AuthAction(action = DEPLOY_BASE.class) @@ -57,8 +55,8 @@ public class TreeDeployAppConfigAppSystemAppModuleEnvApi extends PrivateApiCompo } List deployAppModuleList = deployAppConfigMapper.getAppModuleListBySystemId(appSystemId); deployAppSystemVo.setAppModuleList(deployAppModuleList); - List appModuleIdList = new ArrayList<>(); - List envIdList = new ArrayList<>(); +// List appModuleIdList = new ArrayList<>(); +// List envIdList = new ArrayList<>(); for (DeployAppModuleVo deployAppModuleVo : deployAppModuleList) { // JSONObject resultObj = parsePipeline(appSystemId, deployAppModuleVo.getId()); // deployAppModuleVo.setIsActive(resultObj.getInteger("isActive")); @@ -67,17 +65,30 @@ public class TreeDeployAppConfigAppSystemAppModuleEnvApi extends PrivateApiCompo List deployEnvList = deployAppConfigMapper.getDeployAppEnvListByAppSystemIdAndModuleId(appSystemId, deployAppModuleVo.getId()); //查找cmdb的环境 List cmdbEnvList = deployAppConfigMapper.getCmdbEnvListByAppSystemIdAndModuleId(appSystemId, deployAppModuleVo.getId()); + Set envIdSet = new HashSet<>(); List envList = new ArrayList<>(); - envList.addAll(deployEnvList); - envList.addAll(cmdbEnvList); - deployAppModuleVo.setEnvList(envList); - appModuleIdList.add(deployAppModuleVo.getId()); - for (DeployAppEnvironmentVo env : envList) { - envIdList.add(env.getId()); -// resultObj = parsePipeline(appSystemId, deployAppModuleVo.getId(), env.getId()); -// env.setIsActive(resultObj.getInteger("isActive")); -// env.setOverride(resultObj.getInteger("override")); + for (DeployAppEnvironmentVo env : deployEnvList) { + if (!envIdSet.contains(env.getId())) { + envList.add(env); + envIdSet.add(env.getId()); + } + } + for (DeployAppEnvironmentVo env : cmdbEnvList) { + if (!envIdSet.contains(env.getId())) { + envList.add(env); + envIdSet.add(env.getId()); + } } +// envList.addAll(deployEnvList); +// envList.addAll(cmdbEnvList); + deployAppModuleVo.setEnvList(envList); +// appModuleIdList.add(deployAppModuleVo.getId()); +// for (DeployAppEnvironmentVo env : envList) { +// envIdList.add(env.getId()); +//// resultObj = parsePipeline(appSystemId, deployAppModuleVo.getId(), env.getId()); +//// env.setIsActive(resultObj.getInteger("isActive")); +//// env.setOverride(resultObj.getInteger("override")); +// } } List deployAppConfigList = deployAppConfigMapper.getAppConfigListByAppSystemId(appSystemId); for (DeployAppModuleVo deployAppModuleVo : deployAppModuleList) { diff --git a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java index 794f48d3..03836a84 100644 --- a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java +++ b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java @@ -119,7 +119,8 @@ public class DeployPipelineConfigManager { public Builder withEnvIdList(List envIdList) { if (CollectionUtils.isNotEmpty(envIdList)) { - this.envIdList.addAll(envIdList); + Set envIdSet = new HashSet<>(envIdList); + this.envIdList.addAll(envIdSet); } return this; } @@ -265,14 +266,14 @@ public class DeployPipelineConfigManager { continue; } for (Long envId : envIdList) { -// boolean flag = false; -// for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) { -// if (Objects.equals(deployAppConfigVo.getAppModuleId(), appModuleId) && Objects.equals(deployAppConfigVo.getEnvId(), envId)) { -// flag = true; -// break; -// } -// } -// if (flag) { + boolean flag = false; + for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) { + if (Objects.equals(deployAppConfigVo.getAppModuleId(), appModuleId) && Objects.equals(deployAppConfigVo.getEnvId(), envId)) { + flag = true; + break; + } + } + if (flag) { DeployPipelineConfigVo deployPipelineConfigVo = getMergeDeployPipelineConfig(deployAppConfigList, appSystemId, appModuleId, envId); DeployAppConfigVo deployAppConfigVo = new DeployAppConfigVo(); deployAppConfigVo.setAppSystemId(appSystemId); @@ -280,7 +281,7 @@ public class DeployPipelineConfigManager { deployAppConfigVo.setEnvId(envId); deployAppConfigVo.setConfig(deployPipelineConfigVo); resultList.add(deployAppConfigVo); -// } + } } } -- Gitee From 4f53c84fd192c6c4f43b4073deaa001d7c7897d1 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 16 Jul 2025 19:02:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=9B=86=E6=88=90?= =?UTF-8?q?=E5=8F=91=E5=B8=83-=E6=9F=A5=E8=AF=A2=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE=E7=9A=84=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A8=A1=E5=9D=97=E7=8E=AF=E5=A2=83=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1466730218487808]集成发布-查询发布应用配置的应用系统模块环境树 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1466730218487808 --- ...reeDeployAppConfigAppSystemAppModuleEnvApi.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java index 03f40510..37801216 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java @@ -55,12 +55,7 @@ public class TreeDeployAppConfigAppSystemAppModuleEnvApi extends PrivateApiCompo } List deployAppModuleList = deployAppConfigMapper.getAppModuleListBySystemId(appSystemId); deployAppSystemVo.setAppModuleList(deployAppModuleList); -// List appModuleIdList = new ArrayList<>(); -// List envIdList = new ArrayList<>(); for (DeployAppModuleVo deployAppModuleVo : deployAppModuleList) { -// JSONObject resultObj = parsePipeline(appSystemId, deployAppModuleVo.getId()); -// deployAppModuleVo.setIsActive(resultObj.getInteger("isActive")); -// deployAppModuleVo.setOverride(resultObj.getInteger("override")); //查找发布的环境 List deployEnvList = deployAppConfigMapper.getDeployAppEnvListByAppSystemIdAndModuleId(appSystemId, deployAppModuleVo.getId()); //查找cmdb的环境 @@ -79,16 +74,7 @@ public class TreeDeployAppConfigAppSystemAppModuleEnvApi extends PrivateApiCompo envIdSet.add(env.getId()); } } -// envList.addAll(deployEnvList); -// envList.addAll(cmdbEnvList); deployAppModuleVo.setEnvList(envList); -// appModuleIdList.add(deployAppModuleVo.getId()); -// for (DeployAppEnvironmentVo env : envList) { -// envIdList.add(env.getId()); -//// resultObj = parsePipeline(appSystemId, deployAppModuleVo.getId(), env.getId()); -//// env.setIsActive(resultObj.getInteger("isActive")); -//// env.setOverride(resultObj.getInteger("override")); -// } } List deployAppConfigList = deployAppConfigMapper.getAppConfigListByAppSystemId(appSystemId); for (DeployAppModuleVo deployAppModuleVo : deployAppModuleList) { -- Gitee