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 e550b9bfa69618cc190b968002f76eccd0a4ce48..bfa0fcf007b1d7a25230de13809b5c53dca03f30 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageInfo; import com.pms.ocp.common.utils.RandomStringUtils; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; @@ -20,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.sql.Timestamp; -import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; 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 89a138a5b8d00172cf7d99809bb2be3993632f0f..741e9649fec9c8fe2e2e766968d828e1cca13f93 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -1,13 +1,16 @@ package com.pms.ocp.service.impl; +import cn.afterturn.easypoi.cache.manager.IFileLoader; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.utils.RandomStringUtils; import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.mapper.TenantMapper; import com.pms.ocp.model.dto.*; +import com.pms.ocp.model.entity.ModelAudit; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.TenantService; import org.apache.commons.lang3.StringUtils; @@ -61,7 +64,6 @@ public class TenantServiceImpl extends ServiceImpl public OcpTenantGroup getTenanInster(TenanBaseDto tenanBaseDto) { boolean falg = true; - OcpTenantGroup group = new OcpTenantGroup(); String tenantGroupCode = tenanBaseDto.getTenantGroupCode(); List ocpTenantGroups = tenantMapper.selectList(null); @@ -77,32 +79,19 @@ public class TenantServiceImpl extends ServiceImpl group.setTenantGroupCtime(timestamp); group.setTenantGroupMtime(timestamp); group.setTenantGroupVersion("1.0"); - int i = (Integer.parseInt(tenanBaseDto.getTenantGroupLevel()) + 1); + group.setTenantGroupCode(randomString); + if (tenanBaseDto.getTenantGroupLevel().equals("Middleground")){ + group.setTenantGroupLevel("sys_center"); + } + if (tenanBaseDto.getTenantGroupLevel().equals("sys_center")){ + group.setTenantGroupLevel("api_group"); + } - group.setTenantGroupLevel(String.valueOf(i)); - for (OcpTenantGroup tenantGroup : ocpTenantGroups) { - if (tenantGroup.getTenantGroupCode().equals(tenantGroupCode)) { - falg = false; - break; - } - } //判断是否含有相同的分类名称 - List ocpTenantGroupList = tenantMapper.selectGroupsList(tenanBaseDto.getTenantGroupCompanyCode(), tenanBaseDto.getTenantGroupName()); - if (StringUtils.isBlank(ocpTenantGroupList.toString())) { - falg = false; - } else { - for (OcpTenantGroup tenantGroup : ocpTenantGroupList) { - if (tenanBaseDto.getTenantGroupName().equals(tenantGroup.getTenantGroupName())) { - falg = false; - break; - } - } - } if (falg) { tenanBaseDto.setClassIfy(tenanBaseDto.getTenantGroupCode()); - group.setTenantGroupCode(randomString); tenantMapper.insert(group); group = tenantMapper.selectById(tenanBaseDto.getObjId()); } @@ -146,18 +135,24 @@ public class TenantServiceImpl extends ServiceImpl String objId = ocpTenantGroup.getObjId(); OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectById(objId); boolean flag = true; - List ocpTenantGroupList = tenantMapper.selectList(null); - if (StringUtils.isBlank(ocpTenantGroup1.getTenantGroupPcode())) { - for (OcpTenantGroup tenantGroup : ocpTenantGroupList) { - String tenantGroupPcode = tenantGroup.getTenantGroupPcode(); - if ((ocpTenantGroup.getTenantGroupCode().equals(tenantGroupPcode))) { - flag = false; - break; - } - } - } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper lambdaQueryWrapper = wrapper.eq(OcpTenantGroup::getTenantGroupPcode, ocpTenantGroup1.getTenantGroupCode()); + if (!(StringUtils.isBlank(lambdaQueryWrapper.toString()))){ + tenantMapper.deleteById(objId); + }else { + flag = false; + } + +// List ocpTenantGroupList = tenantMapper.selectList(null); +// for (OcpTenantGroup tenantGroup : ocpTenantGroupList) { +// String tenantGroupPcode = tenantGroup.getTenantGroupPcode(); +// if ((ocpTenantGroup.getTenantGroupCode().equals(tenantGroupPcode))) { +// flag = false; +// break; +// } +// } + - tenantMapper.deleteById(objId); return flag; } @@ -172,15 +167,12 @@ public class TenantServiceImpl extends ServiceImpl @Override public Page getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword,String lev) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - Page page = new Page<>(currentPage, pageSize); if (StringUtils.isBlank(keyword)) { - if(lev.equals("1")) { - // List ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode); + if("".equals(lev)) { LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); -// page.setRecords(ocpTenantGroupList); tenantMapper.selectPage(page, eq); - }else if (lev.equals("2") || lev.equals("3")) { + }else if ("2".equals(lev) || "3".equals(lev)) { LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); tenantMapper.selectPage(page, eq); } diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml index 5af1723b6b3c6c827a53b5f8436d4ae0d9b4e101..508f03da72fa10a467f9963a1c8b50a5e31d8ed0 100644 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -7,7 +7,7 @@ - SELECT * FROM ocp_tenant_group WHERE tenant_group_pcode = #{tenantGroupCode} AND tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '2' ORDER BY tenant_group_ctime DESC; + SELECT * FROM ocp_tenant_group WHERE tenant_group_pcode = #{tenantGroupCode} AND tenant_group_company_code = #{tenantGroupCompanyCode} ORDER BY tenant_group_ctime DESC; - SELECT * FROM ocp_tenant_group WHERE tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '1' ; + SELECT * FROM ocp_tenant_group WHERE tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = 'Middleground' ;