From be6dc5157b645154627ee90d163c6a3fb20c2dd0 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 11 Apr 2025 21:49:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=A7=BB=E5=8A=A8=E6=B5=81=E6=B0=B4=E7=BA=BF?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E6=89=80=E5=B1=9E=E7=BB=84=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1397300805468160]增加一个移动流水线阶段所属组的接口 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1397300805468160 --- ...kDeployAppPipelinePhaseBelongGroupApi.java | 199 +++++++++++++ ...eDeployAppPipelinePhaseBelongGroupApi.java | 276 ++++++++++++++++++ 2 files changed, 475 insertions(+) create mode 100644 src/main/java/neatlogic/module/deploy/api/apppipeline/CheckDeployAppPipelinePhaseBelongGroupApi.java create mode 100644 src/main/java/neatlogic/module/deploy/api/apppipeline/MoveDeployAppPipelinePhaseBelongGroupApi.java diff --git a/src/main/java/neatlogic/module/deploy/api/apppipeline/CheckDeployAppPipelinePhaseBelongGroupApi.java b/src/main/java/neatlogic/module/deploy/api/apppipeline/CheckDeployAppPipelinePhaseBelongGroupApi.java new file mode 100644 index 00000000..126c9c5e --- /dev/null +++ b/src/main/java/neatlogic/module/deploy/api/apppipeline/CheckDeployAppPipelinePhaseBelongGroupApi.java @@ -0,0 +1,199 @@ +/* + * Copyright (C) 2025 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.deploy.api.apppipeline; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.auth.core.AuthAction; +import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; +import neatlogic.framework.cmdb.dto.resourcecenter.AppModuleVo; +import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; +import neatlogic.framework.cmdb.resourcecenter.datasource.core.IResourceCenterDataSource; +import neatlogic.framework.cmdb.resourcecenter.datasource.core.ResourceCenterDataSourceFactory; +import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.common.dto.BasePageVo; +import neatlogic.framework.crossover.CrossoverServiceFactory; +import neatlogic.framework.deploy.auth.DEPLOY_BASE; +import neatlogic.framework.deploy.dto.app.DeployAppConfigVo; +import neatlogic.framework.deploy.dto.app.DeployPipelineConfigVo; +import neatlogic.framework.deploy.dto.app.DeployPipelineGroupVo; +import neatlogic.framework.deploy.dto.app.DeployPipelinePhaseVo; +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; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@AuthAction(action = DEPLOY_BASE.class) +@OperationType(type = OperationTypeEnum.SEARCH) +@Transactional +public class CheckDeployAppPipelinePhaseBelongGroupApi extends PrivateApiComponentBase { + + @Resource + private DeployAppConfigMapper deployAppConfigMapper; + + @Override + public String getName() { + return "检查两个阶段是否在同一个组"; + } + + @Input({ + @Param(name = "phaseName", type = ApiParamType.STRING, desc = "阶段名"), +// @Param(name = "phaseGroupSort", type = ApiParamType.STRING, desc = "阶段组号"), + @Param(name = "targetPhaseName", type = ApiParamType.STRING, desc = "目标阶段名"), +// @Param(name = "targetPhaseGroupSort", type = ApiParamType.STRING, desc = "阶段组号"), + }) + @Output({ + + }) + @Description(desc = "检查两个阶段是否在同一个组") + @Override + public Object myDoService(JSONObject paramObj) throws Exception { + JSONArray resultList = new JSONArray(); + String phaseName = paramObj.getString("phaseName"); + String targetPhaseName = paramObj.getString("targetPhaseName"); + IResourceCenterDataSource resourceCenterDataSource = ResourceCenterDataSourceFactory.getResourceCenterDataSource(); + IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); + List appSystemIdList = deployAppConfigMapper.getAppConfigAppSystemIdListByAppSystemIdList(null); + if (CollectionUtils.isNotEmpty(appSystemIdList)) { + BasePageVo basePageVo = new BasePageVo(); + List appEnvList = resourceCenterDataSource.getAppEnvListForSelect(basePageVo, false); + Map appEnvId2NameMap = appEnvList.stream().filter(Objects::nonNull).collect(Collectors.toMap(ResourceVo::getId, ResourceVo::getName)); + appEnvId2NameMap.put(-2L, "未配置环境"); + for (Long appSystemId : appSystemIdList) { + List appModuleList = resourceCenterDataSource.getAppModuleListForTree(appSystemId); + Map appModuleMap = appModuleList.stream().filter(Objects::nonNull).collect(Collectors.toMap(AppModuleVo::getId, e -> e)); + Set appModuleIdSet = new HashSet<>(); + Set envIdSet = new HashSet<>(); + List appConfigList = deployAppConfigMapper.getAppConfigListByAppSystemIdAndAppModuleIdListAndEnvIdList(appSystemId, null, null); + for (DeployAppConfigVo deployAppConfigVo : appConfigList) { + appModuleIdSet.add(deployAppConfigVo.getAppModuleId()); + envIdSet.add(deployAppConfigVo.getEnvId()); + } + List deployAppConfigList = DeployPipelineConfigManager.init(appSystemId) + .withAppModuleIdList(new ArrayList<>(appModuleIdSet)) + .withEnvIdList(new ArrayList<>(envIdSet)) + .withIsHasBuildOrDeployTypeTool(false) + .withIsUpdateConfig(true) + .withIsUpdateProfile(true) + .getDeployAppConfigList(); + for (DeployAppConfigVo deployAppConfigVo : appConfigList) { + DeployPipelineConfigVo pipelineConfigVo = getDeployPipelineConfigVo(deployAppConfigList, appSystemId, deployAppConfigVo.getAppModuleId(), deployAppConfigVo.getEnvId()); + if (pipelineConfigVo != null) { + JSONObject resultObj = new JSONObject(new LinkedHashMap<>()); + resultObj.put("appSystemId", appSystemId); + ResourceVo appSystemVo = resourceCrossoverMapper.getAppSystemById(appSystemId); + if (appSystemVo != null) { + resultObj.put("appSystemName", appSystemVo.getName()); + resultObj.put("appSystemAbbrName", appSystemVo.getAbbrName()); + } + resultObj.put("appModuleId", deployAppConfigVo.getAppModuleId()); + AppModuleVo appModuleVo = appModuleMap.get(deployAppConfigVo.getAppModuleId()); + if (appModuleVo != null) { + resultObj.put("appModuleName", appModuleVo.getName()); + resultObj.put("appModuleAbbrName", appModuleVo.getAbbrName()); + } + String envName = appEnvId2NameMap.get(deployAppConfigVo.getEnvId()); + resultObj.put("envId", deployAppConfigVo.getEnvId()); + resultObj.put("envName", envName); + boolean flag = analysis(pipelineConfigVo, phaseName, targetPhaseName, resultObj); + if (flag) { + resultList.add(resultObj); + } + } + } + } + } + return resultList; + } + + private boolean analysis(DeployPipelineConfigVo pipelineConfigVo, String phaseName, String targetPhaseName, JSONObject resultObj) { + List combopPhaseList = pipelineConfigVo.getCombopPhaseList(); + DeployPipelinePhaseVo phaseVo = null; + DeployPipelinePhaseVo targetPhaseVo = null; + for (DeployPipelinePhaseVo pipelinePhaseVo : combopPhaseList) { + if (pipelinePhaseVo != null) { + if (Objects.equals(pipelinePhaseVo.getName(), phaseName)) { + phaseVo = pipelinePhaseVo; + } else if (Objects.equals(pipelinePhaseVo.getName(), targetPhaseName)) { + targetPhaseVo = pipelinePhaseVo; + } + } + } + if (phaseVo != null && targetPhaseVo != null) { + if (!Objects.equals(phaseVo.getGroupId(), targetPhaseVo.getGroupId())) { + List combopGroupList = pipelineConfigVo.getCombopGroupList(); + Map id2SortMap = combopGroupList.stream().filter(Objects::nonNull).collect(Collectors.toMap(DeployPipelineGroupVo::getId, DeployPipelineGroupVo::getSort)); + { + resultObj.put("phaseName", phaseName); + Integer sort = id2SortMap.get(phaseVo.getGroupId()); + if (sort != null) { + resultObj.put("phaseGroupSort", (sort + 1)); + } + } + { + resultObj.put("targetPhaseName", targetPhaseName); + Integer sort = id2SortMap.get(targetPhaseVo.getGroupId()); + if (sort != null) { + resultObj.put("targetPhaseGroupSort", (sort + 1)); + } + } + return true; + } + } + return false; + } + + private DeployPipelineConfigVo getDeployPipelineConfigVo(List deployAppConfigList, Long appSystemId, Long appModuleId, Long envId) { + for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) { + if (Objects.equals(deployAppConfigVo.getAppSystemId(), appSystemId) + && Objects.equals(deployAppConfigVo.getAppModuleId(), appModuleId) + && Objects.equals(deployAppConfigVo.getEnvId(), envId)) { + return deployAppConfigVo.getConfig(); + } + } + for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) { + if (Objects.equals(deployAppConfigVo.getAppSystemId(), appSystemId) + && Objects.equals(deployAppConfigVo.getAppModuleId(), appModuleId) + && Objects.equals(deployAppConfigVo.getEnvId(), 0L)) { + return deployAppConfigVo.getConfig(); + } + } + for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) { + if (Objects.equals(deployAppConfigVo.getAppSystemId(), appSystemId) + && Objects.equals(deployAppConfigVo.getAppModuleId(), 0L) + && Objects.equals(deployAppConfigVo.getEnvId(), 0L)) { + return deployAppConfigVo.getConfig(); + } + } + return null; + } + + @Override + public String getToken() { + return "deploy/app/pipeline/phasebelonggroup/check"; + } +} diff --git a/src/main/java/neatlogic/module/deploy/api/apppipeline/MoveDeployAppPipelinePhaseBelongGroupApi.java b/src/main/java/neatlogic/module/deploy/api/apppipeline/MoveDeployAppPipelinePhaseBelongGroupApi.java new file mode 100644 index 00000000..af22b0e7 --- /dev/null +++ b/src/main/java/neatlogic/module/deploy/api/apppipeline/MoveDeployAppPipelinePhaseBelongGroupApi.java @@ -0,0 +1,276 @@ +/* + * Copyright (C) 2025 深圳极向量科技有限公司 All Rights Reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package neatlogic.module.deploy.api.apppipeline; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.auth.core.AuthAction; +import neatlogic.framework.auth.label.ADMIN; +import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; +import neatlogic.framework.cmdb.dto.resourcecenter.AppModuleVo; +import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo; +import neatlogic.framework.cmdb.resourcecenter.datasource.core.IResourceCenterDataSource; +import neatlogic.framework.cmdb.resourcecenter.datasource.core.ResourceCenterDataSourceFactory; +import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.common.dto.BasePageVo; +import neatlogic.framework.crossover.CrossoverServiceFactory; +import neatlogic.framework.deploy.dto.app.DeployAppConfigVo; +import neatlogic.framework.deploy.dto.app.DeployPipelineConfigVo; +import neatlogic.framework.deploy.dto.app.DeployPipelineGroupVo; +import neatlogic.framework.deploy.dto.app.DeployPipelinePhaseVo; +import neatlogic.framework.restful.annotation.Input; +import neatlogic.framework.restful.annotation.OperationType; +import neatlogic.framework.restful.annotation.Output; +import neatlogic.framework.restful.annotation.Param; +import neatlogic.framework.restful.constvalue.OperationTypeEnum; +import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper; +import neatlogic.module.deploy.service.PipelineService; +import neatlogic.module.deploy.util.DeployPipelineConfigManager; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +@Service +@AuthAction(action = ADMIN.class) +@OperationType(type = OperationTypeEnum.UPDATE) +@Transactional +public class MoveDeployAppPipelinePhaseBelongGroupApi extends PrivateApiComponentBase { + + @Resource + private DeployAppConfigMapper deployAppConfigMapper; + + @Resource + PipelineService pipelineService; + + @Override + public String getName() { + return "移动阶段到指定组"; + } + + @Input({ + @Param(name = "appSystemAbbrNameList", type = ApiParamType.LONG, isRequired = true, desc = "应用系统简称列表", help = "isAllAppSystem=0才生效"), + @Param(name = "phaseList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "阶段列表", help = "[{\"name\":\"阶段名\",\"groupSort\":\"阶段组序号\"}]"), + @Param(name = "targetPhaseName", type = ApiParamType.STRING, isRequired = true, desc = "目标阶段名"), + @Param(name = "targetPhaseGroupSort", type = ApiParamType.STRING, isRequired = true, desc = "目标阶段组号"), + @Param(name = "isSave", type = ApiParamType.ENUM, rule = "0,1", isRequired = true, desc = "是否保存"), + @Param(name = "isAllAppSystem", type = ApiParamType.ENUM, rule = "0,1", isRequired = true, desc = "是否扫描所有应用系统"), + }) + @Output({ + + }) + @Override + public Object myDoService(JSONObject paramObj) throws Exception { + JSONArray resultList = new JSONArray(); + String targetPhaseName = paramObj.getString("targetPhaseName"); + Integer targetPhaseGroupSort = paramObj.getInteger("targetPhaseGroupSort"); + Integer isSave = paramObj.getInteger("isSave"); + JSONArray phaseArray = paramObj.getJSONArray("phaseList"); + JSONArray appSystemAbbrNameList = paramObj.getJSONArray("appSystemAbbrNameList"); + Integer isAllAppSystem = paramObj.getInteger("isAllAppSystem"); + if (CollectionUtils.isNotEmpty(phaseArray)) { + IResourceCenterDataSource resourceCenterDataSource = ResourceCenterDataSourceFactory.getResourceCenterDataSource(); + IResourceCrossoverMapper resourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); + List appSystemIdList = deployAppConfigMapper.getAppConfigAppSystemIdListByAppSystemIdList(null); + if (CollectionUtils.isNotEmpty(appSystemIdList)) { + BasePageVo basePageVo = new BasePageVo(); + List appEnvList = resourceCenterDataSource.getAppEnvListForSelect(basePageVo, false); + Map appEnvId2NameMap = appEnvList.stream().filter(Objects::nonNull).collect(Collectors.toMap(ResourceVo::getId, ResourceVo::getName)); + appEnvId2NameMap.put(-2L, "未配置环境"); + for (Long appSystemId : appSystemIdList) { + ResourceVo appSystemVo = resourceCrossoverMapper.getAppSystemById(appSystemId); + if (appSystemVo == null) { + continue; + } + if (Objects.equals(isAllAppSystem, 0)) { + if (!appSystemAbbrNameList.contains(appSystemVo.getAbbrName())) { + continue; + } + } + List appModuleList = resourceCenterDataSource.getAppModuleListForTree(appSystemId); + Map appModuleMap = appModuleList.stream().filter(Objects::nonNull).collect(Collectors.toMap(AppModuleVo::getId, e -> e)); + Set appModuleIdSet = new HashSet<>(); + Set envIdSet = new HashSet<>(); + List appConfigList = deployAppConfigMapper.getAppConfigListByAppSystemIdAndAppModuleIdListAndEnvIdList(appSystemId, null, null); + for (DeployAppConfigVo deployAppConfigVo : appConfigList) { + appModuleIdSet.add(deployAppConfigVo.getAppModuleId()); + envIdSet.add(deployAppConfigVo.getEnvId()); + } + List deployAppConfigList = DeployPipelineConfigManager.init(appSystemId) + .withAppModuleIdList(new ArrayList<>(appModuleIdSet)) + .withEnvIdList(new ArrayList<>(envIdSet)) + .withIsHasBuildOrDeployTypeTool(false) + .withIsUpdateConfig(true) + .withIsUpdateProfile(true) + .getDeployAppConfigList(); + for (DeployAppConfigVo deployAppConfigVo : appConfigList) { + DeployPipelineConfigVo pipelineConfigVo = getDeployPipelineConfigVo(deployAppConfigList, appSystemId, deployAppConfigVo.getAppModuleId(), deployAppConfigVo.getEnvId()); + if (pipelineConfigVo != null) { + boolean flag = analysis(pipelineConfigVo, phaseArray, targetPhaseName, targetPhaseGroupSort); + if (flag) { + JSONObject resultObj = new JSONObject(new LinkedHashMap<>()); + resultObj.put("appSystemId", appSystemId); + resultObj.put("appSystemName", appSystemVo.getName()); + resultObj.put("appSystemAbbrName", appSystemVo.getAbbrName()); + resultObj.put("appModuleId", deployAppConfigVo.getAppModuleId()); + AppModuleVo appModuleVo = appModuleMap.get(deployAppConfigVo.getAppModuleId()); + if (appModuleVo != null) { + resultObj.put("appModuleName", appModuleVo.getName()); + resultObj.put("appModuleAbbrName", appModuleVo.getAbbrName()); + } + String envName = appEnvId2NameMap.get(deployAppConfigVo.getEnvId()); + resultObj.put("envId", deployAppConfigVo.getEnvId()); + resultObj.put("envName", envName); + resultList.add(resultObj); + if (Objects.equals(isSave, 1)) { + deployAppConfigVo.setConfig(pipelineConfigVo); + pipelineService.saveDeployAppPipeline(deployAppConfigVo); + } + } + } + } + } + } + return resultList; + } + return null; + } + + private boolean analysis(DeployPipelineConfigVo pipelineConfigVo, JSONArray phaseArray, String targetPhaseName, Integer targetPhaseGroupSort) { + List combopPhaseList = pipelineConfigVo.getCombopPhaseList(); + List combopGroupList = pipelineConfigVo.getCombopGroupList(); + Map id2DeployPipelineGroupVoMap = combopGroupList.stream().filter(Objects::nonNull).collect(Collectors.toMap(DeployPipelineGroupVo::getId, e -> e)); + + DeployPipelinePhaseVo targetPhaseVo = null; + for (DeployPipelinePhaseVo pipelinePhaseVo : combopPhaseList) { + if (pipelinePhaseVo != null) { + if (Objects.equals(pipelinePhaseVo.getName(), targetPhaseName)) { + DeployPipelineGroupVo groupVo = id2DeployPipelineGroupVoMap.get(pipelinePhaseVo.getGroupId()); + if (groupVo != null) { + Integer sort = groupVo.getSort(); + if (sort != null && sort + 1 == targetPhaseGroupSort) { + targetPhaseVo = pipelinePhaseVo; + break; + } + } + } + } + } + if (targetPhaseVo != null) { + boolean flag = false; + for (int i = 0; i < phaseArray.size(); i++) { + JSONObject phaseObj = phaseArray.getJSONObject(i); + String phaseName = phaseObj.getString("name"); + Integer groupSort = phaseObj.getInteger("groupSort"); + flag = false; + for (DeployPipelinePhaseVo pipelinePhaseVo : combopPhaseList) { + if (pipelinePhaseVo != null) { + if (Objects.equals(pipelinePhaseVo.getName(), phaseName) && Objects.equals(pipelinePhaseVo.getGroupSort() + 1, groupSort)) { + if (!Objects.equals(pipelinePhaseVo.getGroupId(), targetPhaseVo.getGroupId())) { + DeployPipelineGroupVo groupVo = id2DeployPipelineGroupVoMap.get(targetPhaseVo.getGroupId()); + pipelinePhaseVo.setGroupId(groupVo.getId()); + pipelinePhaseVo.setGroupUuid(groupVo.getUuid()); + pipelinePhaseVo.setGroupSort(groupVo.getSort()); + flag = true; + break; + } + } + } + } + } + if (flag) { + List groupIdList = new ArrayList<>(); + for (DeployPipelinePhaseVo pipelinePhaseVo : combopPhaseList) { + groupIdList.add(pipelinePhaseVo.getGroupId()); + } + boolean deleted = false; + for (int i = combopGroupList.size() - 1; i >= 0; i--) { + DeployPipelineGroupVo groupVo = combopGroupList.get(i); + if (groupVo != null) { + if (!groupIdList.contains(groupVo.getId())) { + combopGroupList.remove(i); + deleted = true; + } + } else { + combopGroupList.remove(i); + } + } + if (deleted) { + for (int i = 0; i < combopGroupList.size(); i++) { + DeployPipelineGroupVo groupVo = combopGroupList.get(i); + groupVo.setSort(i); + } + Map id2SortMap = combopGroupList.stream().filter(Objects::nonNull).collect(Collectors.toMap(DeployPipelineGroupVo::getId, DeployPipelineGroupVo::getSort)); + for (DeployPipelinePhaseVo pipelinePhaseVo : combopPhaseList) { + Integer sort = id2SortMap.get(pipelinePhaseVo.getGroupId()); + pipelinePhaseVo.setGroupSort(sort); + } + } + List newPhaseList = new ArrayList<>(); + for (DeployPipelineGroupVo groupVo : combopGroupList) { + int phaseSort = 0; + for (DeployPipelinePhaseVo pipelinePhaseVo : combopPhaseList) { + if (Objects.equals(pipelinePhaseVo.getGroupId(), groupVo.getId())) { + pipelinePhaseVo.setSort(phaseSort); + newPhaseList.add(pipelinePhaseVo); + phaseSort++; + } + } + } + pipelineConfigVo.setCombopPhaseList(newPhaseList); + pipelineConfigVo.setCombopGroupList(combopGroupList); + return true; + } + } + return false; + } + + private DeployPipelineConfigVo getDeployPipelineConfigVo(List deployAppConfigList, Long appSystemId, Long appModuleId, Long envId) { + for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) { + if (Objects.equals(deployAppConfigVo.getAppSystemId(), appSystemId) + && Objects.equals(deployAppConfigVo.getAppModuleId(), appModuleId) + && Objects.equals(deployAppConfigVo.getEnvId(), envId)) { + return deployAppConfigVo.getConfig(); + } + } + for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) { + if (Objects.equals(deployAppConfigVo.getAppSystemId(), appSystemId) + && Objects.equals(deployAppConfigVo.getAppModuleId(), appModuleId) + && Objects.equals(deployAppConfigVo.getEnvId(), 0L)) { + return deployAppConfigVo.getConfig(); + } + } + for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) { + if (Objects.equals(deployAppConfigVo.getAppSystemId(), appSystemId) + && Objects.equals(deployAppConfigVo.getAppModuleId(), 0L) + && Objects.equals(deployAppConfigVo.getEnvId(), 0L)) { + return deployAppConfigVo.getConfig(); + } + } + return null; + } + + @Override + public String getToken() { + return "deploy/app/pipeline/phasebelonggroup/move"; + } +} -- Gitee From 2a21aaa2a844ff0109fc566f7ab2f72e9b5a0473 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 11 Apr 2025 21:53:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=A7=BB=E5=8A=A8=E6=B5=81=E6=B0=B4=E7=BA=BF?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E6=89=80=E5=B1=9E=E7=BB=84=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1397300805468160]增加一个移动流水线阶段所属组的接口 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1397300805468160 --- .../apppipeline/MoveDeployAppPipelinePhaseBelongGroupApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/deploy/api/apppipeline/MoveDeployAppPipelinePhaseBelongGroupApi.java b/src/main/java/neatlogic/module/deploy/api/apppipeline/MoveDeployAppPipelinePhaseBelongGroupApi.java index af22b0e7..7cf7d001 100644 --- a/src/main/java/neatlogic/module/deploy/api/apppipeline/MoveDeployAppPipelinePhaseBelongGroupApi.java +++ b/src/main/java/neatlogic/module/deploy/api/apppipeline/MoveDeployAppPipelinePhaseBelongGroupApi.java @@ -68,7 +68,7 @@ public class MoveDeployAppPipelinePhaseBelongGroupApi extends PrivateApiComponen } @Input({ - @Param(name = "appSystemAbbrNameList", type = ApiParamType.LONG, isRequired = true, desc = "应用系统简称列表", help = "isAllAppSystem=0才生效"), + @Param(name = "appSystemAbbrNameList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "应用系统简称列表", help = "isAllAppSystem=0才生效"), @Param(name = "phaseList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "阶段列表", help = "[{\"name\":\"阶段名\",\"groupSort\":\"阶段组序号\"}]"), @Param(name = "targetPhaseName", type = ApiParamType.STRING, isRequired = true, desc = "目标阶段名"), @Param(name = "targetPhaseGroupSort", type = ApiParamType.STRING, isRequired = true, desc = "目标阶段组号"), -- Gitee