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 eb53e370a1d4758ace0f4dea98fea076edaa1c97..f7e3480b645142fe3d6849009f1fa375cdca2120 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -106,6 +106,9 @@ public class OcpApiTreeServiceImpl extends ServiceImpl */ @Override public OcpTenantGroup getTenanInster(TenanBaseDto tenanBaseDto) { + OcpTenantGroup group = new OcpTenantGroup(); boolean falg = true; if (StringUtils.isNotBlank(tenanBaseDto.getTenantGroupCode())) { List ocpTenantBases = ocpTenantBaseMapper.selcctCodeList(tenanBaseDto.getTenantGroupCode()); if (ocpTenantBases.size() > 0) { + group.setNum("1"); falg = false; } } - - OcpTenantGroup group = new OcpTenantGroup(); - String randomString = RandomStringUtils.getRandomString(6); - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - BeanUtils.copyProperties(tenanBaseDto, group); - group.setTenantGroupPcode(tenanBaseDto.getTenantGroupCode()); - group.setTenantType("应用"); - group.setTenantGroupVersion("1.0"); - group.setTenantGroupCode(randomString); - group.setTenantGroupOrderNo(1); - group.setTenantGroupCtime(timestamp); - group.setTenantGroupMtime(timestamp); - group.setTenantGroupVersion("1.0"); - group.setTenantGroupCode(randomString); - - if ("Middleground".equals(tenanBaseDto.getTenantGroupLevel())) { - group.setTenantGroupLevel("sys_center"); - } else if ("sys_center".equals(tenanBaseDto.getTenantGroupLevel())) { - group.setTenantGroupLevel("api_group"); - } else if (StringUtils.isBlank(tenanBaseDto.getTenantGroupLevel())) { - group.setTenantGroupLevel("Middleground"); - } - group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode()); + if (falg) { + String randomString = RandomStringUtils.getRandomString(6); + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + BeanUtils.copyProperties(tenanBaseDto, group); + group.setTenantGroupPcode(tenanBaseDto.getTenantGroupCode()); + group.setTenantType("应用"); + group.setTenantGroupVersion("1.0"); + group.setTenantGroupCode(randomString); + group.setTenantGroupOrderNo(1); + group.setTenantGroupCtime(timestamp); + group.setTenantGroupMtime(timestamp); + group.setTenantGroupVersion("1.0"); + group.setTenantGroupCode(randomString); + + if ("Middleground".equals(tenanBaseDto.getTenantGroupLevel())) { + group.setTenantGroupLevel("sys_center"); + } else if ("sys_center".equals(tenanBaseDto.getTenantGroupLevel())) { + group.setTenantGroupLevel("api_group"); + } else if (StringUtils.isBlank(tenanBaseDto.getTenantGroupLevel())) { + group.setTenantGroupLevel("Middleground"); + } + if (StringUtils.isNotBlank(tenanBaseDto.getTenantGroupCode())) { + OcpTenantGroup ocpTenantGroup = tenantMapper.selectGroupCode(tenanBaseDto.getTenantGroupCode()); + String tenantGroupName = ocpTenantGroup.getTenantGroupName(); + group.setClassIfy(tenantGroupName); + } + } String tenantGroupCompanyCode = tenanBaseDto.getTenantGroupName(); //判断是否含有相同的分类名称 List ocpTenantGroupList = tenantMapper.selectList(null); - for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { - String tenantGroupCompanyCode1 = ocpTenantGroup.getTenantGroupName(); - if (tenantGroupCompanyCode.equals(tenantGroupCompanyCode1)) { - falg = false; - group.setNum("1"); + if (falg) { + for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { + String tenantGroupCompanyCode1 = ocpTenantGroup.getTenantGroupName(); + if (tenantGroupCompanyCode.equals(tenantGroupCompanyCode1)) { + falg = false; + group.setNum("1"); + } } } diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml index 08cac3416dff47c1813995d96489d6ad0da5b739..82258887cce7e056ba512af4f79496669e3d4260 100644 --- a/src/main/resources/mapper/OcpApiGroupMapper.xml +++ b/src/main/resources/mapper/OcpApiGroupMapper.xml @@ -132,7 +132,7 @@ and oag.api_group_name = #{apiGroupName} - order by oab.api_mtime desc + order by oab.api_ctime desc diff --git a/src/main/resources/mapper/OcpTenantBaseMapper.xml b/src/main/resources/mapper/OcpTenantBaseMapper.xml index 20df46ec1bcd83dc3c75b64f7d1ccbda8a82ae10..b478627ad614bc3e014c9deceea105b2fa5d050f 100644 --- a/src/main/resources/mapper/OcpTenantBaseMapper.xml +++ b/src/main/resources/mapper/OcpTenantBaseMapper.xml @@ -31,7 +31,7 @@ where tenant_name = #{appName} - select * from ocp_tenant_base where tenant_group_code = #{tenantGroupCode}