diff --git a/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java b/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java index 40c89cd5db23af686181c8361bb62c3a0fd7a50a..acde305f650e509820123a4a63b6163968a7283b 100644 --- a/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java +++ b/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java @@ -17,6 +17,7 @@ public class RandomStringUtils { String str="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; Random random=new Random(); StringBuffer sb=new StringBuffer(); + for(int i=0;i { //根据code查询整条数据 OcpApiGroup selectCode(String code); + + //根据code查询是否=含有下级服务 + List selectGroupPcode(); } 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 e63eda1e67be32a82fe6b66531f66c9505c6eea4..6d969c9c363cf1ca27ecc658c3a249e92a4b7266 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -91,7 +91,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(OcpApiGroup::getApiGroupCode, ocpApiGroup.getApiGroupCode()); + queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode()); String objId = ocpApiGroup.getObjId(); - if (StringUtils.isBlank(ocpApiGroup.getApiGroupCode())) { - flag = false; - } else { - LambdaQueryWrapper eq = queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode()); - if (StringUtils.isBlank(eq.toString())) { - flag = false; - } + List list = mapper.selectGroupPcode(); + if (list.size() >= 1) { + flag = false; } if (flag) { mapper.deleteById(objId); @@ -164,15 +160,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl pageInfo = new Page(pageGroupDto.getCurrentPage(), pageGroupDto.getPageSize()); LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); if (StringUtils.isBlank(pageGroupDto.getKeyword())) { - if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){ + if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())) { qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); - mapper.selectPage(pageInfo, qw); + mapper.selectPage(pageInfo, qw); - } else if(!(StringUtils.isNotBlank(pageGroupDto.getApiGroupPcode()))){ + } else if (!(StringUtils.isNotBlank(pageGroupDto.getApiGroupPcode()))) { List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode()); - qw.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType()).and(c->c.eq(OcpApiGroup::getApiGroupPcode,pageGroupDto.getApiGroupCode())); + qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()).and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())); pageInfo.setRecords(ocpApiGroups); - mapper.selectPage(pageInfo,qw); + mapper.selectPage(pageInfo, qw); List records = pageInfo.getRecords(); for (OcpApiGroup record : records) { OcpApiGroup ocpApiGroup = mapper.selectCode(record.getApiGroupPcode()); @@ -181,14 +177,13 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword())) - .and(c->c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())); + .and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())); mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper); } - return pageInfo; } } diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml index f634b451a490d31fa5cbaec93380c55bba587896..b4d115ed0e08b66e2d44739837f3047332bf6d2e 100644 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -30,5 +30,9 @@ SELECT * FROM ocp_api_group where api_group_code = #{apiGroupCode}; + + \ No newline at end of file