diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index 638300e0e9df403483887163e5c2307a5db469fa..3b2472466e298fdecc3092132b3ea76749b87863 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -34,8 +34,8 @@ public class OcpApiTreeController { */ @GetMapping("/getTree") @ApiOperation("服务树分类") - public ResponseVO< List> getTree(String apiGroupPromotionType,String apiGroupCode){ - List byGroup = service.getByGroup(apiGroupPromotionType, apiGroupCode); + public ResponseVO< List> getTree(OcpApiGroup ocpApiGroup){ + List byGroup = service.getByGroup(ocpApiGroup.getApiGroupPromotionType(), ocpApiGroup.getApiGroupCode()); return ResponseVO.ok(byGroup); } @@ -51,9 +51,9 @@ public class OcpApiTreeController { } - @PostMapping("/getone") + @GetMapping("/getone") @ApiOperation("服务树分类--分级数据") - public ResponseVO> getOne(@RequestBody PageGroupDto pageGroupDto){ + public ResponseVO> getOne(PageGroupDto pageGroupDto){ Page onePages = service.getOnePages(pageGroupDto); return ResponseVO.ok(onePages); } diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index 77c9b44753e74caaf59a74cfd941cbb3a59aec68..ee91ab473dfe7791d3f75eb5b0c92d668c2c6f8e 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -40,8 +40,8 @@ public class OcpTenantController { } @GetMapping("/tenantselect") @ApiModelProperty("应用树分类--查询") - private Page getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize){ - Page tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize); + private Page getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword){ + Page tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword); return tree; } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java index 3d6e8257b6f44bdbfd17d01dd8cd7126ae6602d1..c4ad7ec474960356cfb82dc467645cd53a7914aa 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java @@ -26,8 +26,11 @@ public interface OcpApiTreeMapper extends BaseMapper { * @param apiGroupPromotionType * @return */ - List selectTwoApiGroups(String apiGroupPromotionType); + List selectTwoApiGroups(Long apiGroupPromotionType); //三级数 - List selectThreeApiGroupsList(String apiGroupPromotionType, String apiGroupCode); + List selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode); + + + List selectList(Long apiGroupPromotionType, String apiGroupCode,Long apiGroupLevel); } diff --git a/src/main/java/com/pms/ocp/mapper/TenantMapper.java b/src/main/java/com/pms/ocp/mapper/TenantMapper.java index 69a169858a67feb584f49619c266047393f26488..aa28e63e13511cb74f6670db75a3f519f1115db9 100644 --- a/src/main/java/com/pms/ocp/mapper/TenantMapper.java +++ b/src/main/java/com/pms/ocp/mapper/TenantMapper.java @@ -29,6 +29,10 @@ public interface TenantMapper extends BaseMapper { List selectGroups(String tenantGroupCompanyCode); + //模糊查询 + List queryLike(String keyword); + + } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java index 205eb47aaf0e6f6503677d2b30a76c5a0fb0d565..f2b40d6c69b21511c661ab88862f1c57106316d1 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java @@ -186,4 +186,5 @@ public class OcpApiGroup { } + } diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java index f2aff55232f96a7c01d51c0625102f882cca2ed1..7e3d79e0e5344a959e972870e8733a605040db03 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -16,7 +16,7 @@ public interface OcpApiTreeService extends IService { /** * 服务树分类 */ - List getByGroup(String apiGroupPromotionType,String apiGroupCode); + List getByGroup(Long apiGroupPromotionType,String apiGroupCode); /** * 新增服务分类 diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java index 8e140210c039f541b97c5ba9cc03e355e9ebdcd5..c917957e91f5d3bb4c0efde1f6b7bebdf7753a84 100644 --- a/src/main/java/com/pms/ocp/service/TenantService.java +++ b/src/main/java/com/pms/ocp/service/TenantService.java @@ -48,17 +48,6 @@ public interface TenantService extends IService { * @param tenantGroupCompanyCode * @return */ - Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize); + Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text); -/*// 应用分类--一级 - OcpTenantGroupDto getTenantOneTree(); - // 应用分类--二级 - List getTenantTwoTree(String code);*/ - - /* *//** - * // 应用分类--三级 - * @param code - * @return - *//* - List getTenantThreeTree(String code);*/ } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index b002cb1dd48b6cf089dfba39e339bb2f6fa8a714..3a1cb73796d44363a9389769b3796b0a190bed84 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -41,7 +41,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getByGroup(String apiGroupPromotionType,String apiGroupCode) { + public List getByGroup(Long apiGroupPromotionType,String apiGroupCode) { // if (StringUtils.isBlank(apiGroupPromotionType) && StringUtils.isBlank(apiGroupCode)) { // List ocpApiGroups = mapper.selectApiGroups(); @@ -59,113 +59,6 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); - - - //服务树分类对象 - ApiTreeGroupDto apiTreeGroupList = new ApiTreeGroupDto(); - //1中台层 - List oneTreeUpLists = new ArrayList<>(); - - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - //判断数据状态 - if (!(ocpApiGroup.getIsDelete() == 0)) { - //一级服务对象 - OneTreeUpList oneTreeUpList = new OneTreeUpList(); -// 判断数据是否有上级服务分类 - if (ocpApiGroup.getApiGroupLevel() == 1) { - BeanUtils.copyProperties(ocpApiGroup, oneTreeUpList); - oneTreeUpLists.add(oneTreeUpList); - } - } - } - List twoDownLists = twoTreeLists(oneTreeUpLists, ocpApiGroups); - List threeTreeLists = threeTreeLists(twoDownLists, ocpApiGroups); - List fourTreeLists = fourTreeLists(threeTreeLists, ocpApiGroups); - apiTreeGroupList.setOneList(oneTreeUpLists); - apiTreeGroupList.setTwoList(twoDownLists); - apiTreeGroupList.setThreeList(threeTreeLists); - apiTreeGroupList.setFourList(fourTreeLists); - - - return apiTreeGroupList; - } - - *//** - * 2中心层 - * - * @param oneTreeUpLists - * @return - *//* - public List twoTreeLists(List oneTreeUpLists, List ocpApiGroups) { - - *//* List groupList = new ArrayList<>();*//* - List twoTreeLists = new ArrayList<>(); - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - TwoDownList twoDownList = new TwoDownList(); - if (!(ocpApiGroup.getIsDelete() == 0)) { - if (ocpApiGroup.getApiGroupLevel() == 2) { - BeanUtils.copyProperties(ocpApiGroup, twoDownList); - twoTreeLists.add(twoDownList); - } else { - continue; - } - } - } - - return twoTreeLists; - - } - - *//** - * 3服务组层 - * - * @param twoDownLists - * @return - *//* - public List threeTreeLists(List twoDownLists, List ocpApiGroups) { - List threeTreeLists = new ArrayList<>(); - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - ThreeTreeList threeTreeList = new ThreeTreeList(); - if (!(ocpApiGroup.getIsDelete() == 0)) { - if (ocpApiGroup.getApiGroupLevel() == 3) { - BeanUtils.copyProperties(ocpApiGroup, threeTreeList); - threeTreeLists.add(threeTreeList); - } - } else { - continue; - } - - } - return threeTreeLists; - - } - - *//** - * 4服务层 - * - * @param threeTreeLists - * @return - *//* - public List fourTreeLists(List threeTreeLists, List ocpApiGroups) { - List foureTreeList = new ArrayList<>(); - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (!(ocpApiGroup.getIsDelete() == 0)) { - if (ocpApiGroup.getApiGroupLevel() == 4) { - FourTreeList fourTreeList = new FourTreeList(); - BeanUtils.copyProperties(ocpApiGroup, fourTreeList); - foureTreeList.add(fourTreeList); - } - } else { - continue; - } - - } - return foureTreeList; - - } -*/ /** * 新增服务分类 * @@ -244,22 +137,6 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getOnePage(int pageSize, int pageNum, int apiGroupLevel) { - - Page pageInfo = new Page(pageSize,pageNum); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - LambdaQueryWrapper eq = queryWrapper.eq(OcpApiGroup::getApiGroupLevel, apiGroupLevel); - List ocpApiGroups = mapper.selectList(eq); - return ocpApiGroups; - }*/ - /** * 服务列表分级查询 * @@ -270,44 +147,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getOnePages(PageGroupDto pageGroupDto) { Page pageInfo = new Page(pageGroupDto.getPageSize(), pageGroupDto.getPageNum()); - if (pageGroupDto.getApiGroupLevel() == 1 && "".equals(pageGroupDto.getApiGroupPcode())){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel()); - mapper.selectPage(pageInfo,queryWrapper); - }else if (pageGroupDto.getApiGroupLevel() == 2){ - List ocpApiGroups = mapper.selectList(null); - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (pageGroupDto.getApiGroupCode().equals(ocpApiGroup.getApiGroupCode())){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel()); - mapper.selectPage(pageInfo,queryWrapper); - } - } - - }else if (pageGroupDto.getApiGroupLevel() == 3){ - List ocpApiGroups = mapper.selectList(null); - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (pageGroupDto.getApiGroupCode() == ocpApiGroup.getApiGroupCode()) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel()); - mapper.selectPage(pageInfo, queryWrapper); - } - } - }else { - List ocpApiGroups = mapper.selectList(null); - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (pageGroupDto.getApiGroupCode() == ocpApiGroup.getApiGroupCode()) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel()); - mapper.selectPage(pageInfo, queryWrapper); - } - } - + if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){ + List ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType()); + pageInfo.setRecords(ocpApiGroups); + }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){ + List ocpApiGroups = mapper.selectList(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel()); + LambdaQueryWrapper lwq = new LambdaQueryWrapper<>(); + pageInfo.setRecords(ocpApiGroups); + mapper.selectPage(pageInfo, lwq); } return pageInfo; - } - - - } diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index 01a1c90491663b672c327c14615fc1e47445356b..5301d1f0f4b5ec3e6b1e1cd268f9365d3b21b865 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -12,6 +12,7 @@ import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.TenantService; +import com.zaxxer.hikari.util.IsolationLevel; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -152,21 +153,35 @@ public class TenantServiceImpl extends ServiceImpl * @return */ @Override - public Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize) { - Page page = new Page<>(currentPage,pageSize); - if (StringUtils.isBlank(tenantGroupCode)){ - //顶级目录 - List ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); - page.setRecords(ocpTenantGroupList); - + public Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword) { + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + List ocpTenantGroupList1 = tenantMapper.selectList(null); + Page page = new Page<>(currentPage, pageSize); + if ("".equals(keyword)) { + if (StringUtils.isBlank(tenantGroupCode)) { + for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList1) { + if (ocpTenantGroup.getTenantGroupPcode().equals(tenantGroupCode) && ocpTenantGroup.getTenantGroupCompanyCode().equals(tenantGroupCompanyCode)){ + List ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); + page.setRecords(ocpTenantGroupList); + tenantMapper.selectPage(page,qw); + } + } + } else { + for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList1) { + if (ocpTenantGroup.getTenantGroupPcode().equals(tenantGroupCode) && ocpTenantGroup.getTenantGroupCompanyCode().equals(tenantGroupCompanyCode)) { + List ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode, tenantGroupCompanyCode); + page.setRecords(ocpTenantGroupList); + tenantMapper.selectPage(page,qw); + } + } + } + return page; }else { - - List ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode,tenantGroupCompanyCode); + List ocpTenantGroupList = tenantMapper.queryLike(keyword); page.setRecords(ocpTenantGroupList); + tenantMapper.selectPage(page,qw); + return page; } - return page; - } - - + } } diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 759ae80b12c0f3876c94ab5f9a404a9ac463bc05..0f73a771b24d9d846ed7b0ba83cb759e686069ba 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -6,7 +6,7 @@ spring: type: com.zaxxer.hikari.HikariDataSource # jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true # jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true - url: jdbc:postgresql://localhost:5432/operating_platform?stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true + url: jdbc:postgresql://localhost:5432/postgres?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true knife4j: enable: true