From 4128ae3acab070850f767b470bb1210edcf6ea10 Mon Sep 17 00:00:00 2001
From: chenjg <17688741996@163.com>
Date: Mon, 22 Jul 2024 15:13:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?#[1199127977754624]=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E9=87=8C=E5=AE=9E=E4=BE=8B=E6=98=BE=E7=A4=BA=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=AD=97=E6=AE=B5=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/11?=
 =?UTF-8?q?99127977754624?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../env/GetDeployAppConfigEnvInfoApi.java     | 22 ++++++++++++++-
 .../dao/mapper/DeployInstanceVersion.xml      | 22 +++++++++++++++
 .../mapper/DeployInstanceVersionMapper.java   |  4 +++
 .../type/DeployJobSourceTypeHandler.java      | 27 +++++++++++++++++++
 4 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppConfigEnvInfoApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppConfigEnvInfoApi.java
index 7a6e12aa..28d2767f 100644
--- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppConfigEnvInfoApi.java
+++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/GetDeployAppConfigEnvInfoApi.java
@@ -15,6 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 package neatlogic.module.deploy.api.appconfig.env;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import neatlogic.framework.auth.core.AuthAction;
@@ -29,10 +30,12 @@ import neatlogic.framework.deploy.auth.DEPLOY_BASE;
 import neatlogic.framework.deploy.dto.app.DeployAppConfigEnvDBConfigVo;
 import neatlogic.framework.deploy.dto.app.DeployAppEnvAutoConfigKeyValueVo;
 import neatlogic.framework.deploy.dto.app.DeployAppEnvAutoConfigVo;
+import neatlogic.framework.deploy.dto.instance.DeployInstanceVersionVo;
 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.dao.mapper.DeployInstanceVersionMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -55,6 +58,9 @@ public class GetDeployAppConfigEnvInfoApi extends PrivateApiComponentBase {
     @Resource
     private DeployAppConfigMapper deployAppConfigMapper;
 
+    @Resource
+    DeployInstanceVersionMapper deployInstanceVersionMapper;
+
     @Override
     public String getToken() {
         return "deploy/app/config/env/info/get";
@@ -96,7 +102,21 @@ public class GetDeployAppConfigEnvInfoApi extends PrivateApiComponentBase {
         if (CollectionUtils.isNotEmpty(instanceIdList)) {
 
             List<ResourceVo> instanceList = resourceCrossoverMapper.getAppInstanceResourceListByIdList(instanceIdList);
-            envInfo.put("instanceList", instanceList);
+            // 补充实例当前版本信息
+            List<DeployInstanceVersionVo> instanceVersionVoList = deployInstanceVersionMapper.getDeployInstanceVersionByEnvIdAndInstanceIdList(envAutoConfigVo.getAppSystemId(), envAutoConfigVo.getAppModuleId(), envAutoConfigVo.getEnvId(), instanceIdList);
+            if (CollectionUtils.isNotEmpty(instanceVersionVoList)) {
+                Map<Long, DeployInstanceVersionVo> versionMap = instanceVersionVoList.stream().collect(Collectors.toMap(DeployInstanceVersionVo::getResourceId, e -> e));
+                JSONArray instanceArray = new JSONArray();
+                for (ResourceVo resourceVo : instanceList) {
+                    JSONObject instanceObj = (JSONObject) JSONObject.toJSON(resourceVo);
+                    instanceObj.put("version", versionMap.containsKey(resourceVo.getId()) ? versionMap.get(resourceVo.getId()).getVersion() : "");
+                    instanceObj.put("instanceVersion", versionMap.get(resourceVo.getId()));
+                    instanceArray.add(instanceObj);
+                }
+                envInfo.put("instanceList", instanceArray);
+            } else {
+                envInfo.put("instanceList", instanceList);
+            }
             List<DeployAppEnvAutoConfigVo> instanceAutoConfigList = deployAppConfigMapper.getAppEnvAutoConfigListBySystemIdAndModuleIdAndEnvIdAndInstanceIdList(paramObj.getLong("appSystemId"), paramObj.getLong("appModuleId"), paramObj.getLong("envId"), instanceIdList);
             envInfo.put("instanceAutoConfigList", instanceAutoConfigList);
 
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployInstanceVersion.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployInstanceVersion.xml
index ea627bd7..8eec59cf 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployInstanceVersion.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployInstanceVersion.xml
@@ -34,6 +34,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         for update
     </select>
 
+    <select id="getDeployInstanceVersionByEnvIdAndInstanceIdList"
+            resultType="neatlogic.framework.deploy.dto.instance.DeployInstanceVersionVo">
+        select
+            iv.app_system_id as appSystemId,
+            iv.app_module_id as appModuleId,
+            iv.env_id as envId,
+            iv.resource_id as resourceId,
+            iv.version_id as versionId,
+            iv.build_no as buildNo,
+            iv.lcu,
+            iv.lcd,
+            v.version
+        from deploy_instance_version iv
+        join deploy_version v ON v.id = iv.version_id
+        where iv.app_system_id = #{appSystemId} and iv.app_module_id = #{appModuleId}
+          and iv.env_id = #{envId}
+          and iv.resource_id in
+        <foreach collection="instanceIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
     <select id="getDeployInstanceOldestVersionByInstanceIdAndNewVersionId"
             resultType="neatlogic.framework.deploy.dto.instance.DeployInstanceVersionAuditVo">
         select
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployInstanceVersionMapper.java b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployInstanceVersionMapper.java
index de0be541..73ba5d47 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployInstanceVersionMapper.java
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployInstanceVersionMapper.java
@@ -4,10 +4,14 @@ import neatlogic.framework.deploy.dto.instance.DeployInstanceVersionAuditVo;
 import neatlogic.framework.deploy.dto.instance.DeployInstanceVersionVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface DeployInstanceVersionMapper {
 
     DeployInstanceVersionVo getDeployInstanceVersionByEnvIdAndInstanceIdLock(@Param("appSystemId") Long appSystemId, @Param("appModuleId") Long appModuleId, @Param("envId") Long envId, @Param("instanceId") Long instanceId);
 
+    List<DeployInstanceVersionVo> getDeployInstanceVersionByEnvIdAndInstanceIdList(@Param("appSystemId") Long appSystemId, @Param("appModuleId") Long appModuleId, @Param("envId") Long envId, @Param("instanceIdList") List<Long> instanceIdList);
+
     DeployInstanceVersionAuditVo getDeployInstanceOldestVersionByInstanceIdAndNewVersionId(@Param("appSystemId") Long appSystemId, @Param("appModuleId") Long appModuleId, @Param("envId") Long envId, @Param("instanceId") Long instanceId, @Param("newVersionId") Long newVersionId);
 
     int insertDeployInstanceVersion(DeployInstanceVersionVo vo);
diff --git a/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java b/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java
index b6463f56..1509d117 100644
--- a/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java
+++ b/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java
@@ -50,6 +50,7 @@ import neatlogic.framework.deploy.constvalue.JobSource;
 import neatlogic.framework.deploy.constvalue.JobSourceType;
 import neatlogic.framework.deploy.dto.app.DeployPipelineConfigVo;
 import neatlogic.framework.deploy.dto.app.DeployProfileVo;
+import neatlogic.framework.deploy.dto.instance.DeployInstanceVersionVo;
 import neatlogic.framework.deploy.dto.job.DeployJobContentVo;
 import neatlogic.framework.deploy.dto.job.DeployJobVo;
 import neatlogic.framework.deploy.dto.pipeline.PipelineJobTemplateVo;
@@ -76,6 +77,7 @@ import neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper;
 import neatlogic.module.deploy.dao.mapper.DeployJobMapper;
 import neatlogic.module.deploy.dao.mapper.DeploySqlMapper;
 import neatlogic.module.deploy.dao.mapper.DeployVersionMapper;
+import neatlogic.module.deploy.dao.mapper.DeployInstanceVersionMapper;
 import neatlogic.module.deploy.util.DeployPipelineConfigManager;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -113,6 +115,9 @@ public class DeployJobSourceTypeHandler extends AutoexecJobSourceTypeHandlerBase
     @Resource
     GlobalLockMapper globalLockMapper;
 
+    @Resource
+    DeployInstanceVersionMapper deployInstanceVersionMapper;
+
     @Override
     public String getName() {
         return JobSourceType.DEPLOY.getValue();
@@ -715,4 +720,26 @@ public class DeployJobSourceTypeHandler extends AutoexecJobSourceTypeHandlerBase
         return getExtraJobInfo(jobVo);
     }
 
+    @Override
+    public void addExtraJobPhaseNodeInfoByList(Long jobId, List<AutoexecJobPhaseNodeVo> jobPhaseNodeVoList) {
+        if (jobId != null && CollectionUtils.isNotEmpty(jobPhaseNodeVoList)) {
+            DeployJobVo deployJobVo = deployJobMapper.getDeployJobByJobId(jobId);
+            if (deployJobVo != null) {
+                Long appSystemId = deployJobVo.getAppSystemId();
+                Long appModuleId = deployJobVo.getAppModuleId();
+                Long envId = deployJobVo.getEnvId();
+                List<Long> instanceIdList = jobPhaseNodeVoList.stream().map(AutoexecJobPhaseNodeVo::getResourceId).filter(Objects::nonNull).collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(instanceIdList)) {
+                    List<DeployInstanceVersionVo> instanceVersionVoList = deployInstanceVersionMapper.getDeployInstanceVersionByEnvIdAndInstanceIdList(appSystemId, appModuleId, envId, instanceIdList);
+                    Map<Long, DeployInstanceVersionVo> versionMap = instanceVersionVoList.stream().collect(Collectors.toMap(DeployInstanceVersionVo::getResourceId, e -> e));
+                    for (AutoexecJobPhaseNodeVo jobPhaseNodeVo : jobPhaseNodeVoList) {
+                        JSONObject extraInfo = new JSONObject();
+                        extraInfo.put("version", versionMap.containsKey(jobPhaseNodeVo.getResourceId()) ? versionMap.get(jobPhaseNodeVo.getResourceId()).getVersion() : "");
+                        extraInfo.put("instanceVersion", versionMap.get(jobPhaseNodeVo.getResourceId()));
+                        jobPhaseNodeVo.setExtraInfo(extraInfo);
+                    }
+                }
+            }
+        }
+    }
 }
-- 
Gitee


From f558875e1a1af5f9eb9e84ac355bf8d1e06b64fe Mon Sep 17 00:00:00 2001
From: chenjg <17688741996@163.com>
Date: Mon, 22 Jul 2024 15:32:18 +0800
Subject: [PATCH 2/2] fix

---
 .../deploy/job/source/type/DeployJobSourceTypeHandler.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java b/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java
index 1509d117..33521802 100644
--- a/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java
+++ b/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java
@@ -732,8 +732,12 @@ public class DeployJobSourceTypeHandler extends AutoexecJobSourceTypeHandlerBase
                 if (CollectionUtils.isNotEmpty(instanceIdList)) {
                     List<DeployInstanceVersionVo> instanceVersionVoList = deployInstanceVersionMapper.getDeployInstanceVersionByEnvIdAndInstanceIdList(appSystemId, appModuleId, envId, instanceIdList);
                     Map<Long, DeployInstanceVersionVo> versionMap = instanceVersionVoList.stream().collect(Collectors.toMap(DeployInstanceVersionVo::getResourceId, e -> e));
+                    JSONObject extraInfo = null;
                     for (AutoexecJobPhaseNodeVo jobPhaseNodeVo : jobPhaseNodeVoList) {
-                        JSONObject extraInfo = new JSONObject();
+                        extraInfo = jobPhaseNodeVo.getExtraInfo();
+                        if (extraInfo == null) {
+                            extraInfo = new JSONObject();
+                        }
                         extraInfo.put("version", versionMap.containsKey(jobPhaseNodeVo.getResourceId()) ? versionMap.get(jobPhaseNodeVo.getResourceId()).getVersion() : "");
                         extraInfo.put("instanceVersion", versionMap.get(jobPhaseNodeVo.getResourceId()));
                         jobPhaseNodeVo.setExtraInfo(extraInfo);
-- 
Gitee