From 75473c8d26ec804260d15506db13cf99681237bb Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 27 May 2025 17:41:18 +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-=E6=A8=A1=E5=9D=97=E5=B1=82=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=8E=AF=E5=A2=83=E6=97=B6=EF=BC=8C=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=9C=80=E5=A4=9A=E5=8F=AA=E5=9B=9E?= =?UTF-8?q?=E6=98=BE20=E4=B8=AA=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1429787317338112]应用配置-模块层添加环境时，环境下拉框最多只回显20个选项 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1429787317338112 --- .../module/ListDeployAppConfigAppEnvApi.java | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java index 3726c09f..d57cd094 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java @@ -22,14 +22,18 @@ import neatlogic.framework.cmdb.dto.globalattr.GlobalAttrItemVo; import neatlogic.framework.cmdb.dto.globalattr.GlobalAttrVo; import neatlogic.framework.cmdb.dto.resourcecenter.entity.AppEnvironmentVo; import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.common.dto.BasePageVo; +import neatlogic.framework.common.util.PageUtil; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.deploy.auth.DEPLOY_BASE; 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; +import neatlogic.framework.util.TableResultUtil; import neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -69,6 +73,9 @@ public class ListDeployAppConfigAppEnvApi extends PrivateApiComponentBase { @Input({ @Param(name = "keyword", type = ApiParamType.STRING, desc = "common.keyword"), + @Param(name = "currentPage", type = ApiParamType.INTEGER, desc = "common.currentpage"), + @Param(name = "pageSize", type = ApiParamType.INTEGER, desc = "common.pagesize"), + @Param(name = "needPage", type = ApiParamType.BOOLEAN, defaultValue = "false", desc = "common.isneedpage"), @Param(name = "appSystemId", type = ApiParamType.LONG, isRequired = true, desc = "term.cmdb.appsystemid"), @Param(name = "appModuleId", type = ApiParamType.LONG, desc = "term.cmdb.appmoduleid"), @Param(name = "isHasEnv", type = ApiParamType.INTEGER, desc = "term.cmdb.isexistingenv", help = "0:查找现没有的环境，1：查找现有的环境"), @@ -100,16 +107,16 @@ public class ListDeployAppConfigAppEnvApi extends PrivateApiComponentBase { List globalAttrList = globalAttrCrossoverMapper.searchGlobalAttr(globalAttrVo); if (CollectionUtils.isNotEmpty(globalAttrList)) { globalAttrVo = globalAttrList.get(0); - GlobalAttrItemVo globalAttrItemVo = new GlobalAttrItemVo(); - globalAttrItemVo.setAttrId(globalAttrVo.getId()); - globalAttrItemVo.setKeyword(keyword); - globalAttrItemList = globalAttrCrossoverMapper.searchGlobalAttrItem(globalAttrItemVo); + globalAttrItemList = globalAttrCrossoverMapper.getAllGlobalAttrItemByAttrId(globalAttrVo.getId()); } for (GlobalAttrItemVo globalAttrItemVo : globalAttrItemList) { Long id = globalAttrItemVo.getId(); if (cmdbEnvIdList.contains(id) || deployEnvIdList.contains(id)) { continue; } + if (StringUtils.isNotBlank(keyword) && !globalAttrItemVo.getValue().toLowerCase().contains(keyword.toLowerCase())) { + continue; + } returnEnvList.add(new DeployAppEnvironmentVo(id, globalAttrItemVo.getValue())); } } else { @@ -142,6 +149,17 @@ public class ListDeployAppConfigAppEnvApi extends PrivateApiComponentBase { } } } - return returnEnvList.stream().sorted(Comparator.comparing(DeployAppEnvironmentVo::getId)).collect(Collectors.toList()); + returnEnvList = returnEnvList.stream().sorted(Comparator.comparing(DeployAppEnvironmentVo::getId)).collect(Collectors.toList()); + Boolean needPage = paramObj.getBoolean("needPage"); + if (needPage) { + Integer currentPage = paramObj.getInteger("currentPage"); + Integer pageSize = paramObj.getInteger("pageSize"); + BasePageVo basePageVo = new BasePageVo(); + basePageVo.setCurrentPage(currentPage); + basePageVo.setPageSize(pageSize); + basePageVo.setRowNum(returnEnvList.size()); + return TableResultUtil.getResult(PageUtil.subList(returnEnvList, basePageVo), basePageVo); + } + return TableResultUtil.getResult(returnEnvList); } } -- Gitee