From 5bc28eb55ff2ffef0e691fa0bbcc8ab3a056cac0 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 11 Feb 2025 18:01:01 +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-=E5=9C=A8=E7=8E=AF=E5=A2=83=E5=B1=82?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=B5=81=E6=B0=B4=E7=BA=BF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=8C=E6=8F=90=E7=A4=BA=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E7=BA=BF=E4=B8=8D=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1339898458505216]应用配置-在环境层复制流水线配置失败，提示流水线不存在 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1339898458505216
---
 .../env/CopyDeployAppConfigEnvConfigApi.java  | 37 ++++++++-----------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/CopyDeployAppConfigEnvConfigApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/CopyDeployAppConfigEnvConfigApi.java
index a96c11aa..e8fbf160 100644
--- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/CopyDeployAppConfigEnvConfigApi.java
+++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/CopyDeployAppConfigEnvConfigApi.java
@@ -20,8 +20,10 @@ import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.deploy.auth.DEPLOY_BASE;
 import neatlogic.framework.deploy.constvalue.DeployAppConfigAction;
-import neatlogic.framework.deploy.dto.app.*;
-import neatlogic.framework.deploy.exception.DeployAppConfigNotFoundException;
+import neatlogic.framework.deploy.dto.app.DeployAppConfigEnvDBConfigVo;
+import neatlogic.framework.deploy.dto.app.DeployAppConfigVo;
+import neatlogic.framework.deploy.dto.app.DeployAppEnvAutoConfigVo;
+import neatlogic.framework.deploy.dto.app.DeployAppEnvironmentVo;
 import neatlogic.framework.restful.annotation.*;
 import neatlogic.framework.restful.constvalue.OperationTypeEnum;
 import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase;
@@ -92,30 +94,21 @@ public class CopyDeployAppConfigEnvConfigApi extends PrivateApiComponentBase {
         deployAppAuthorityService.checkOperationAuth(appSystemId, DeployAppConfigAction.EDIT);
 
         //来源环境层独有一份配置
-        boolean hasFromEnvConfig = deployAppConfigMapper.getAppConfigByAppSystemIdAndAppModuleIdAndEnvId(appSystemId, appModuleId, fromEnvId) != null;
-
-        //复制流水线配置
-        DeployAppConfigVo fromEnvAppConfigVo = deployAppConfigMapper.getAppConfigVo(new DeployAppConfigVo(appSystemId, appModuleId, fromEnvId));
-        if (fromEnvAppConfigVo == null) {
-            throw new DeployAppConfigNotFoundException(appModuleId);
-        }
-        DeployPipelineConfigVo fromEnvConfigVo = fromEnvAppConfigVo.getConfig();
-//        DeployPipelineConfigVo fromEnvConfigVo = DeployPipelineConfigManager.init(appSystemId).withAppModuleId(appModuleId).withEnvId(fromEnvId).getConfig();
-        if (fromEnvConfigVo == null) {
-            throw new DeployAppConfigNotFoundException(appModuleId);
-        }
-        List<DeployAppConfigVo> insertAppConfigList = new ArrayList<>();
-        for (Long envId : toEnvIdList) {
-            if (hasFromEnvConfig) {
-                insertAppConfigList.add(new DeployAppConfigVo(appSystemId, appModuleId, envId, fromEnvConfigVo));
-            } else {
+        DeployAppConfigVo fromEnvAppConfigVo = deployAppConfigMapper.getAppConfigByAppSystemIdAndAppModuleIdAndEnvId(appSystemId, appModuleId, fromEnvId);
+        if (fromEnvAppConfigVo != null && fromEnvAppConfigVo.getConfig() != null) {
+            List<DeployAppConfigVo> insertAppConfigList = new ArrayList<>();
+            for (Long envId : toEnvIdList) {
+                insertAppConfigList.add(new DeployAppConfigVo(appSystemId, appModuleId, envId, fromEnvAppConfigVo.getConfig()));
+            }
+            if (CollectionUtils.isNotEmpty(insertAppConfigList)) {
+                deployAppConfigMapper.insertBatchAppConfig(insertAppConfigList);
+            }
+        } else {
+            for (Long envId : toEnvIdList) {
                 //删除原有的配置(虽然前端已经有接口控制只能选没有独一份配置的环境，但是防止单独调接口，做多一次删除动作)
                 deployAppConfigMapper.deleteAppConfig(new DeployAppConfigVo(appSystemId, appModuleId, envId));
             }
         }
-        if (CollectionUtils.isNotEmpty(insertAppConfigList)) {
-            deployAppConfigMapper.insertBatchAppConfig(insertAppConfigList);
-        }
 
         //新增环境
         if (paramObj.getInteger("isAdd") == 1) {
-- 
Gitee