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 953e7a57cc73ee32ebbac2eb0079357faeeb985f..de8d5517bba31bc26306a23c7ec9989824e5aacd 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) { diff --git a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java index e194cac1ca4f8c01366b588f20f6ae692ea89674..a1f78b69333d8e3a1fb5cfd4c03f1d6c22100672 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); + } } }