From ae4fa42868cacc5a887d66655a19a973e9a06202 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 16 Jul 2025 16:52:14 +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 --- .../TreeDeployAppConfigAppSystemAppModuleEnvApi.java | 9 +-------- 1 file changed, 1 insertion(+), 8 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 953e7a57..de8d5517 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 @@ -10,7 +10,6 @@ import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper; -import neatlogic.module.deploy.util.DeployPipelineConfigManager; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -80,13 +79,7 @@ public class TreeDeployAppConfigAppSystemAppModuleEnvApi extends PrivateApiCompo // env.setOverride(resultObj.getInteger("override")); } } - List deployAppConfigList = DeployPipelineConfigManager.init(appSystemId) - .withAppModuleIdList(appModuleIdList) - .withEnvIdList(envIdList) - .withIsHasBuildOrDeployTypeTool(false) - .withIsUpdateConfig(false) - .withIsUpdateProfile(false) - .getDeployAppConfigList(); + List deployAppConfigList = deployAppConfigMapper.getAppConfigListByAppSystemId(appSystemId); for (DeployAppModuleVo deployAppModuleVo : deployAppModuleList) { DeployPipelineConfigVo pipelineConfigVo = getDeployPipelineConfigVo(deployAppConfigList, appSystemId, deployAppModuleVo.getId(), 0L); if (pipelineConfigVo != null) { -- Gitee From de260c361fc8a901e13761cd7bc4c6d15ede0f7d Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 16 Jul 2025 17:37:05 +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 --- .../util/DeployPipelineConfigManager.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java index e194cac1..a1f78b69 100644 --- a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java +++ b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java @@ -265,13 +265,22 @@ public class DeployPipelineConfigManager { continue; } for (Long envId : envIdList) { - DeployPipelineConfigVo deployPipelineConfigVo = getMergeDeployPipelineConfig(deployAppConfigList, appSystemId, appModuleId, envId); - DeployAppConfigVo deployAppConfigVo = new DeployAppConfigVo(); - deployAppConfigVo.setAppSystemId(appSystemId); - deployAppConfigVo.setAppModuleId(appModuleId); - deployAppConfigVo.setEnvId(envId); - deployAppConfigVo.setConfig(deployPipelineConfigVo); - resultList.add(deployAppConfigVo); + 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); + deployAppConfigVo.setAppModuleId(appModuleId); + deployAppConfigVo.setEnvId(envId); + deployAppConfigVo.setConfig(deployPipelineConfigVo); + resultList.add(deployAppConfigVo); + } } } -- Gitee