From fea4fa0ea3fc5ae3b0f6dcd1b3e154b62b4b3915 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 28 Apr 2025 15:04:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E4=BE=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1389297788223488]环境的实例列表 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1389297788223488 --- .../env/GetDeployAppConfigEnvInfoApi.java | 2 +- .../env/SaveDeployAppConfigInstanceApi.java | 17 +++++++------- .../env/SearchDeployAppConfigInstanceApi.java | 8 +++++-- .../dao/mapper/DeployAppConfigMapper.java | 20 ++++++++-------- .../dao/mapper/DeployAppConfigMapper.xml | 23 +++++++++++++++---- 5 files changed, 45 insertions(+), 25 deletions(-) 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 32af5576..d3d20d45 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 @@ -86,7 +86,7 @@ public class GetDeployAppConfigEnvInfoApi extends PrivateApiComponentBase { public String getConfig() { return null; } - + //{"needPage":false,"appSystemId":669482179420161,"appModuleId":669491121676288,"envId":481856650534925,"appSystemName":"TomcatTest","envName":"SIT","moduleName":"WebTest"} @Input({ @Param(name = "appSystemId", type = ApiParamType.LONG, isRequired = true, desc = "应用 id"), @Param(name = "appModuleId", type = ApiParamType.LONG, isRequired = true, desc = "模块 id"), diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigInstanceApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigInstanceApi.java index aef69da2..3085905f 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigInstanceApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigInstanceApi.java @@ -68,7 +68,7 @@ public class SaveDeployAppConfigInstanceApi extends PrivateApiComponentBase { public String getToken() { return "deploy/app/config/instance/save"; } - +// {"instanceIdList":[1061599224643585],"appSystemId":669482179420161,"appModuleId":669491121676288,"envId":481856650534925,"appSystemName":"TomcatTest","envName":"SIT","moduleName":"WebTest"} @Input({ @Param(name = "appSystemId", type = ApiParamType.LONG, isRequired = true, desc = "应用系统id"), @Param(name = "appModuleId", type = ApiParamType.LONG, isRequired = true, desc = "应用模块id"), @@ -84,24 +84,25 @@ public class SaveDeployAppConfigInstanceApi extends PrivateApiComponentBase { }) @Override public Object myDoService(JSONObject paramObj) throws Exception { - + Long appSystemId = paramObj.getLong("appSystemId"); + Long envId = paramObj.getLong("envId"); //校验环境权限、编辑配置的操作权限 - deployAppAuthorityService.checkEnvAuth(paramObj.getLong("appSystemId"), paramObj.getLong("envId")); - deployAppAuthorityService.checkOperationAuth(paramObj.getLong("appSystemId"), DeployAppConfigAction.EDIT); + deployAppAuthorityService.checkEnvAuth(appSystemId, envId); + deployAppAuthorityService.checkOperationAuth(appSystemId, DeployAppConfigAction.EDIT); //校验应用系统id、应用模块id、环境id是否存在 ICiEntityCrossoverMapper iCiEntityCrossoverMapper = CrossoverServiceFactory.getApi(ICiEntityCrossoverMapper.class); IResourceCrossoverMapper iResourceCrossoverMapper = CrossoverServiceFactory.getApi(IResourceCrossoverMapper.class); - CiEntityVo appSystemCiEntity = iCiEntityCrossoverMapper.getCiEntityBaseInfoById(paramObj.getLong("appSystemId")); + CiEntityVo appSystemCiEntity = iCiEntityCrossoverMapper.getCiEntityBaseInfoById(appSystemId); if (appSystemCiEntity == null) { - throw new CiEntityNotFoundException(paramObj.getLong("appSystemId")); + throw new CiEntityNotFoundException(appSystemId); } if (iCiEntityCrossoverMapper.getCiEntityBaseInfoById(paramObj.getLong("appModuleId")) == null) { throw new CiEntityNotFoundException(paramObj.getLong("appModuleId")); } - ResourceVo env = iResourceCrossoverMapper.getAppEnvById(paramObj.getLong("envId")); + ResourceVo env = iResourceCrossoverMapper.getAppEnvById(envId); if (env == null) { - throw new AppEnvNotFoundException(paramObj.getLong("envId")); + throw new AppEnvNotFoundException(envId); } //实例挂环境 JSONArray instanceIdArray = paramObj.getJSONArray("instanceIdList"); diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppConfigInstanceApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppConfigInstanceApi.java index b714526c..7ae46661 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppConfigInstanceApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SearchDeployAppConfigInstanceApi.java @@ -12,6 +12,7 @@ import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.framework.util.TableResultUtil; import neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -44,7 +45,7 @@ public class SearchDeployAppConfigInstanceApi extends PrivateApiComponentBase { public String getConfig() { return null; } - +// {"currentPage":1,"pageSize":20,"keyword":"","appSystemId":669482179420161,"appModuleId":669491121676288,"envId":481856650534925,"appSystemName":"TomcatTest","envName":"SIT","moduleName":"WebTest","isAutoConfig":0} @Input({ @Param(name = "keyword", type = ApiParamType.STRING, desc = "模糊查询"), @Param(name = "appSystemId", type = ApiParamType.LONG, isRequired = true, desc = "应用系统id"), @@ -66,7 +67,10 @@ public class SearchDeployAppConfigInstanceApi extends PrivateApiComponentBase { int count = deployAppConfigMapper.getAppConfigEnvInstanceCount(searchVo); if (count > 0) { searchVo.setRowNum(count); - instanceList = deployAppConfigMapper.searchAppConfigEnvInstanceList(searchVo); + List instanceIdList = deployAppConfigMapper.searchAppConfigEnvInstanceIdList(searchVo); + if (CollectionUtils.isNotEmpty(instanceIdList)) { + instanceList = deployAppConfigMapper.searchAppConfigEnvInstanceListByIdList(instanceIdList); + } } return TableResultUtil.getResult(instanceList, searchVo); } diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java index d187f49d..00943456 100644 --- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java +++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java @@ -67,7 +67,17 @@ public interface DeployAppConfigMapper extends IDeployAppConfigCrossoverMapper { DeployAppConfigVo getAppConfigDraft(DeployAppConfigVo deployAppConfigDraftVo); - List searchAppConfigEnvInstanceList(DeployAppConfigInstanceVo searchVo); + /** + * 查询发布应用配置的应用实例下的无模块无环境、无模块同环境、同模块无环境的实例个数 + * + * @param searchVo searchVo + * @return count + */ + int getAppConfigEnvInstanceCount(DeployAppConfigInstanceVo searchVo); + + List searchAppConfigEnvInstanceIdList(DeployAppConfigInstanceVo searchVo); + + List searchAppConfigEnvInstanceListByIdList(List idList); List getDeployAppEnvListByAppSystemIdAndModuleIdList(@Param("appSystemId") Long appSystemId, @Param("appModuleIdList") List appModuleIdList); @@ -196,14 +206,6 @@ public interface DeployAppConfigMapper extends IDeployAppConfigCrossoverMapper { int getAppModuleEnvAutoConfigInstanceIdCount(DeployAppEnvAutoConfigVo searchVo); - /** - * 查询发布应用配置的应用实例下的无模块无环境、无模块同环境、同模块无环境的实例个数 - * - * @param searchVo searchVo - * @return count - */ - int getAppConfigEnvInstanceCount(DeployAppConfigInstanceVo searchVo); - int checkDeployAppConfigEnvDBSchemaIsRepeat(DeployAppConfigEnvDBConfigVo configVo); // int getAppModuleCountBySystemIdAndEnvId(@Param("appSystemId") Long appSystemId, @Param("envId") Long envId); diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml index ee01bf36..3a0111e4 100644 --- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml +++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml @@ -904,19 +904,32 @@ along with this program. If not, see .--> - + +