diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index 632f0d13cdf9f094e482c479c0064cd9958a2aa1..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 getTree(){ - ApiTreeGroupDto byGroup = service.getByGroup(); + 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); } @@ -81,10 +81,4 @@ public class OcpApiTreeController { } - - - - - - } diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index 3f8cb3d7090051d1132d6c13e24edce8aaa728a4..ee91ab473dfe7791d3f75eb5b0c92d668c2c6f8e 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -2,9 +2,7 @@ package com.pms.ocp.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.pms.ocp.model.dto.PageOcpTenantDto; -import com.pms.ocp.model.dto.OcpTenantGroupDto; -import com.pms.ocp.model.dto.TenanBaseDto; +import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.vo.ResponseVO; @@ -17,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Set; @Slf4j @@ -28,14 +27,21 @@ public class OcpTenantController { @Autowired private TenantService tenantService; + /** * 应用树分类 + * @return */ - - @GetMapping("/tenanttree") + @GetMapping("/tenantOnetree") @ApiModelProperty("应用树分类") - private OcpTenantGroupDto getTenantTree(){ - OcpTenantGroupDto tree = tenantService.getTree(); + private List getTenantTree(OcpTenantGroup ocpTenantGroup) { + List tree= tenantService.getTree(ocpTenantGroup.getTenantGroupCompanyCode(),ocpTenantGroup.getTenantGroupCode()); + return tree; + } + @GetMapping("/tenantselect") + @ApiModelProperty("应用树分类--查询") + private Page getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword){ + Page tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword); return tree; } @@ -70,20 +76,6 @@ public class OcpTenantController { } - @PostMapping("tenantuse") - @ApiOperation("应用分类--应用管理") - public ResponseVO> tenantUse(@RequestBody PageOcpTenantDto ocpTenantDto){ - List onePages = tenantService.getsUse(ocpTenantDto); - return ResponseVO.ok(onePages); - } - - @PostMapping("tenantcase") - @ApiOperation("应用分类--应用服务分页查") - public ResponseVO> tenantCase(@RequestBody PageOcpTenantDto pageOcpTenantDto){ - Page pages= tenantService.getOnePages(pageOcpTenantDto); - - return ResponseVO.ok(pages); - } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java index 1ae0c02458477b6d6eaff4e87cc75a86dff48f3f..c4ad7ec474960356cfb82dc467645cd53a7914aa 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java @@ -14,4 +14,23 @@ import java.util.List; @Mapper public interface OcpApiTreeMapper extends BaseMapper { + /** + * 一级树 + * @return + */ + List selectApiGroups(); + + + /** + * 二级树 + * @param apiGroupPromotionType + * @return + */ + List selectTwoApiGroups(Long apiGroupPromotionType); + + //三级数 + 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 c043a2ee0fd89874920374187c12e1671997513d..aa28e63e13511cb74f6670db75a3f519f1115db9 100644 --- a/src/main/java/com/pms/ocp/mapper/TenantMapper.java +++ b/src/main/java/com/pms/ocp/mapper/TenantMapper.java @@ -11,12 +11,28 @@ public interface TenantMapper extends BaseMapper { /** - * - * @param tenantGroupCompanyCode + *应用一级查询顶级服务 + * @param * @return */ - OcpTenantGroup oneTenantGroup(String tenantGroupCompanyCode); + List oneTenantGroup(); + + + //二级目录树 + List twoTenantGroups(String tenantGroupCode,String tenantGroupCompanyCode); + + List selectTenantGroups(String tenantGroupCode,String tenantGroupCompanyCode); + + List selectTenantGroup(String tenantGroupCompanyCode); + + + List selectGroups(String tenantGroupCompanyCode); + + + //模糊查询 + List queryLike(String keyword); + + - List twoTenantGroups(String tenantGroupCompanyPCode); } diff --git a/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java b/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java index 4e1e17c13d2340cd0d5b89ab0ca197d1521bc140..796e7dfc469fb487d149162b14228411b675a982 100644 --- a/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java +++ b/src/main/java/com/pms/ocp/model/dto/OcpTenantGroupDto.java @@ -1,6 +1,7 @@ package com.pms.ocp.model.dto; +import com.pms.ocp.model.entity.OcpTenantGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,36 +14,13 @@ import java.util.Set; public class OcpTenantGroupDto { @ApiModelProperty("创建公司") - private Set oneList; + private List List; - - @ApiModelProperty("应用管理") - private List twoList; - - @ApiModelProperty("应用层") - private List ThreeList; - - public Set getOneList() { - return oneList; - } - - public void setOneList(Set oneList) { - this.oneList = oneList; - } - - public List getTwoList() { - return twoList; - } - - public void setTwoList(List twoList) { - this.twoList = twoList; - } - - public List getThreeList() { - return ThreeList; + public java.util.List getList() { + return List; } - public void setThreeList(List threeList) { - ThreeList = threeList; + public void setList(java.util.List list) { + List = list; } } diff --git a/src/main/java/com/pms/ocp/model/dto/OneTenanList.java b/src/main/java/com/pms/ocp/model/dto/OneTenanList.java deleted file mode 100644 index ed518e521e20723a33fcab235959feef9dd7a5c6..0000000000000000000000000000000000000000 --- a/src/main/java/com/pms/ocp/model/dto/OneTenanList.java +++ /dev/null @@ -1,213 +0,0 @@ -package com.pms.ocp.model.dto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -@EqualsAndHashCode(callSuper=false) -@ApiModel(value = "一级创建公司") -@Data -public class OneTenanList { - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty("主键") - private String objId; - - /** - * 应用分类编码 - */ - @ApiModelProperty("应用分类编码") - private String tenantGroupCode; - - /** - * 应用分类名称 - */ - @ApiModelProperty("应用分类名称") - private String tenantGroupName; - - /** - * 分类创建公司 - */ - @ApiModelProperty("分类创建公司") - private String tenantGroupCompanyCode; - - /** - * 上级code - */ - @ApiModelProperty("上级code") - private String tenantGroupPcode; - - /** - * 应用类别设备级、生态级等 - */ - @ApiModelProperty("应用类别设备级、生态级等") - private String tenantType; - - /** - * 分类版本 - */ - @ApiModelProperty("分类版本") - private String tenantGroupVersion; - - /** - * 显示顺序 - */ - @ApiModelProperty("显示顺序") - private Integer tenantGroupOrderNo; - - /** - * 提交人id - */ - @ApiModelProperty("提交人id") - private String tenantGroupUserId; - - /** - * 提交人姓名 - */ - @ApiModelProperty("提交人姓名") - private String tenantGroupUserName; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Date tenantGroupCtime; - - /** - * 修改时间 - */ - @ApiModelProperty("修改时间") - private Date tenantGroupMtime; - - /** - * 是否删除 - */ - @ApiModelProperty("是否删除") - private Short isDelete; - - /** - * 应用树层级 1:应用分组层 2:应用层 - */ - @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") - private Short tenantGroupLevel; - - public String getObjId() { - return objId; - } - - public void setObjId(String objId) { - this.objId = objId; - } - - public String getTenantGroupCode() { - return tenantGroupCode; - } - - public void setTenantGroupCode(String tenantGroupCode) { - this.tenantGroupCode = tenantGroupCode; - } - - public String getTenantGroupName() { - return tenantGroupName; - } - - public void setTenantGroupName(String tenantGroupName) { - this.tenantGroupName = tenantGroupName; - } - - public String getTenantGroupCompanyCode() { - return tenantGroupCompanyCode; - } - - public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) { - this.tenantGroupCompanyCode = tenantGroupCompanyCode; - } - - public String getTenantGroupPcode() { - return tenantGroupPcode; - } - - public void setTenantGroupPcode(String tenantGroupPcode) { - this.tenantGroupPcode = tenantGroupPcode; - } - - public String getTenantType() { - return tenantType; - } - - public void setTenantType(String tenantType) { - this.tenantType = tenantType; - } - - public String getTenantGroupVersion() { - return tenantGroupVersion; - } - - public void setTenantGroupVersion(String tenantGroupVersion) { - this.tenantGroupVersion = tenantGroupVersion; - } - - public Integer getTenantGroupOrderNo() { - return tenantGroupOrderNo; - } - - public void setTenantGroupOrderNo(Integer tenantGroupOrderNo) { - this.tenantGroupOrderNo = tenantGroupOrderNo; - } - - public String getTenantGroupUserId() { - return tenantGroupUserId; - } - - public void setTenantGroupUserId(String tenantGroupUserId) { - this.tenantGroupUserId = tenantGroupUserId; - } - - public String getTenantGroupUserName() { - return tenantGroupUserName; - } - - public void setTenantGroupUserName(String tenantGroupUserName) { - this.tenantGroupUserName = tenantGroupUserName; - } - - public Date getTenantGroupCtime() { - return tenantGroupCtime; - } - - public void setTenantGroupCtime(Date tenantGroupCtime) { - this.tenantGroupCtime = tenantGroupCtime; - } - - public Date getTenantGroupMtime() { - return tenantGroupMtime; - } - - public void setTenantGroupMtime(Date tenantGroupMtime) { - this.tenantGroupMtime = tenantGroupMtime; - } - - public Short getIsDelete() { - return isDelete; - } - - public void setIsDelete(Short isDelete) { - this.isDelete = isDelete; - } - - public Short getTenantGroupLevel() { - return tenantGroupLevel; - } - - public void setTenantGroupLevel(Short tenantGroupLevel) { - this.tenantGroupLevel = tenantGroupLevel; - } -} diff --git a/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java b/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java index 23fbc8f34256fd5deabd702ff24119904edaf649..227d51bd51ac13c2e629e9797d0a7bbff9d3783a 100644 --- a/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java +++ b/src/main/java/com/pms/ocp/model/dto/ThreeTenanList.java @@ -14,7 +14,7 @@ import java.util.Date; @ApiModel(value = "三级应用") @Data public class ThreeTenanList { - +//3 /** * 主键 diff --git a/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java b/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java index 235991619863c4546561bb9a9d4a6963a47915af..2a81db8b55f048cf0996baf80c2a99861feb37f1 100644 --- a/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java +++ b/src/main/java/com/pms/ocp/model/dto/TwoTenanList.java @@ -15,7 +15,7 @@ import java.util.Date; @ApiModel(value = "二级应用管理") @Data public class TwoTenanList { - +//1 /** * 主键 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 c388652ed26fa6e230f9becee5509e44412282a3..7e3d79e0e5344a959e972870e8733a605040db03 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -8,7 +8,7 @@ import com.pms.ocp.model.dto.OcpApiGroupDtos; import com.pms.ocp.model.dto.PageGroupDto; import com.pms.ocp.model.entity.OcpApiGroup; - +import java.util.List; public interface OcpApiTreeService extends IService { @@ -16,7 +16,7 @@ public interface OcpApiTreeService extends IService { /** * 服务树分类 */ - ApiTreeGroupDto getByGroup(); + 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 de1ac0edd0020f45e295f0a1db6b87edcd146df2..c917957e91f5d3bb4c0efde1f6b7bebdf7753a84 100644 --- a/src/main/java/com/pms/ocp/service/TenantService.java +++ b/src/main/java/com/pms/ocp/service/TenantService.java @@ -3,26 +3,20 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.dto.OcpTenantGroupDto; -import com.pms.ocp.model.dto.PageGroupDto; -import com.pms.ocp.model.dto.PageOcpTenantDto; -import com.pms.ocp.model.dto.TenanBaseDto; +import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.vo.ResponseVO; import java.util.List; +import java.util.Set; public interface TenantService extends IService { /** * 应用树分类管理 * @return */ - - - - - OcpTenantGroupDto getTree(); + List getTree(String tenantGroupCode,String tenantGroupCompanyCode); /** * 应用新增 @@ -46,17 +40,14 @@ public interface TenantService extends IService { boolean gettenantDelete(OcpTenantGroup ocpTenantGroup); - /** - * 应用分类--应用管理 - * @param ocpTenantDto - * @return - */ - List getsUse(PageOcpTenantDto ocpTenantDto); + /** - * 应用分类--应用服务分页查 - * @param pageOcpTenantDto + * 应用--查询 + * @param tenantGroupCode + * @param tenantGroupCompanyCode * @return */ - Page getOnePages(PageOcpTenantDto pageOcpTenantDto); + Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text); + } 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 e2b12a5624163fe73716b9c3b5ed01c2a7b4d0af..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,114 +41,23 @@ 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; + public List getByGroup(Long apiGroupPromotionType,String apiGroupCode) { + +// if (StringUtils.isBlank(apiGroupPromotionType) && StringUtils.isBlank(apiGroupCode)) { + // List ocpApiGroups = mapper.selectApiGroups(); + // return ocpApiGroups; +// }else + if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)){ + List ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType); + return ocpApiGroups; + } else if(!("".equals(apiGroupPromotionType)) && !(StringUtils.isBlank(apiGroupCode))){ + List ocpApiGroups = mapper.selectThreeApiGroupsList(apiGroupPromotionType, apiGroupCode); + return ocpApiGroups; } + return null; } - return threeTreeLists; - } - - /** - * 4服务层 - * - * @param threeTreeLists - * @return - */ - public List fourTreeLists(List threeTreeLists, List ocpApiGroups) { - List foureTreeList = new ArrayList<>(); - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - FourTreeList fourTreeList = new FourTreeList(); - if (!(ocpApiGroup.getIsDelete() == 0)) { - if (ocpApiGroup.getApiGroupLevel() == 4) { - BeanUtils.copyProperties(fourTreeList, foureTreeList); - foureTreeList.add(fourTreeList); - } - } else { - continue; - } - - } - return foureTreeList; - - } /** * 新增服务分类 @@ -168,7 +77,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; - }*/ - /** * 服务列表分级查询 * @@ -253,45 +145,17 @@ 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); - } - } + Page pageInfo = new Page(pageGroupDto.getPageSize(), pageGroupDto.getPageNum()); + 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 84f6119f6433b62ea3536100aaff2f68b28be550..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; @@ -34,68 +35,25 @@ public class TenantServiceImpl extends ServiceImpl * * @return */ - @Override - public OcpTenantGroupDto getTree() { - List ocpTenantGroups = tenantMapper.selectList(null); - - //返回参数集合 - OcpTenantGroupDto ocpTenantGroupDto = new OcpTenantGroupDto(); - //顶级目录 - Set stringSet = new HashSet<>(); - - for (OcpTenantGroup ocpTenantGroup : ocpTenantGroups) { - String tenantGroupCompanyCode = ocpTenantGroup.getTenantGroupCompanyCode(); - stringSet.add(tenantGroupCompanyCode); + @Override + public List getTree(String tenantGroupCompanyCode ,String tenantGroupCode) { + List ocpTenantGroupList = null; + if (StringUtils.isBlank(tenantGroupCode) && StringUtils.isBlank(tenantGroupCompanyCode)){ + //顶级目录 + ocpTenantGroupList = tenantMapper.oneTenantGroup(); + }else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)){ + //二级目录 + ocpTenantGroupList = tenantMapper.selectGroups(tenantGroupCompanyCode); } + else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) &&!(StringUtils.isBlank(tenantGroupCompanyCode))){ + //三级目录 + ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode,tenantGroupCompanyCode); - List tenanLists = twoTenanTree(ocpTenantGroups,stringSet); - List threeTenanLists = ThreeTenanTree(ocpTenantGroups,tenanLists); - ocpTenantGroupDto.setOneList(stringSet); - ocpTenantGroupDto.setTwoList(tenanLists); - ocpTenantGroupDto.setThreeList(threeTenanLists); - - - return ocpTenantGroupDto; - } - - private List ThreeTenanTree(List ocpTenantGroups, List tenanLists) { - //三级应用详情 - List threeTenanLists = new ArrayList<>(); - for (TwoTenanList tenanList : tenanLists) { - for (OcpTenantGroup ocpTenantGroup : ocpTenantGroups) { - ThreeTenanList threeTenanList = new ThreeTenanList(); - if (tenanList.getTenantGroupCode().equals(ocpTenantGroup.getTenantGroupPcode()) && ocpTenantGroup.getTenantGroupLevel() == 2){ - BeanUtils.copyProperties(ocpTenantGroup,threeTenanList); - threeTenanLists.add(threeTenanList); - } - } } - return threeTenanLists; + return ocpTenantGroupList; } - /** - * 二级 应用管理 - * @param ocpTenantGroups - * @param stringSet - * @return - */ - private List twoTenanTree(List ocpTenantGroups, Set stringSet) { - //一级数据集合 - List twoTenanLists = new ArrayList<>(); - for (String code : stringSet) { - for (OcpTenantGroup ocpTenantGroup : ocpTenantGroups) { - TwoTenanList twoTenanList = new TwoTenanList(); - if (code.equals(ocpTenantGroup.getTenantGroupCompanyCode()) &&ocpTenantGroup.getTenantGroupLevel() == 1){ - BeanUtils.copyProperties(ocpTenantGroup,twoTenanList); - twoTenanLists.add(twoTenanList); - } - } - } - return twoTenanLists; - } - - /** * 应用新增 * @@ -188,64 +146,42 @@ public class TenantServiceImpl extends ServiceImpl } /** - * 应用分类--应用管理 + * 应用--查询 * - * @param ocpTenantDto + * @param tenantGroupCode + * @param tenantGroupCompanyCode * @return */ @Override - public List getsUse(PageOcpTenantDto ocpTenantDto) { - + public Page getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(OcpTenantGroup::getTenantGroupCompanyCode,ocpTenantDto.getTenantGroupCompanyCode()); - List ocpTenantGroupList = tenantMapper.selectList(qw); - /*for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { - if ("".equals(ocpTenantGroup.getTenantGroupPcode()) && ocpTenantDto.getTenantGroupCompanyCode().equals(ocpTenantGroup.getTenantGroupCompanyCode()) - && ocpTenantGroup.getTenantGroupLevel() == 1){ - ocpTenantGroups.add(ocpTenantGroup); - } - }*/ - return ocpTenantGroupList; - } - - /** - * 应用分类--应用服务分页查 - * @param pageOcpTenantDto - * @return - */ - @Override - public Page getOnePages(PageOcpTenantDto pageOcpTenantDto) { - Page pageInfo; - int pageSize = pageOcpTenantDto.getPageSize(); - int pageNum = pageOcpTenantDto.getPageNum(); - if (pageSize != 0 && pageNum != 0){ - pageInfo = new Page<>(pageSize,pageNum); - List ocpTenantGroupList = tenantMapper.selectList(null); - for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { - if ("".equals(ocpTenantGroup.getTenantGroupPcode())){ - continue; + 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); + } } - if (pageOcpTenantDto.getTenantGroupCode().equals(ocpTenantGroup.getTenantGroupPcode())){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.eq(OcpTenantGroup::getTenantGroupLevel,2); - queryWrapper.eq(OcpTenantGroup::getTenantGroupCompanyCode,ocpTenantGroup.getTenantGroupCompanyCode()); - tenantMapper.selectPage(pageInfo,queryWrapper); + } 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 { - pageSize = 1; - pageNum = 5; - pageInfo = new Page<>(pageSize,pageNum); - List ocpTenantGroupList = tenantMapper.selectList(null); - for (OcpTenantGroup ocpTenantGroup : ocpTenantGroupList) { - if (ocpTenantGroup.getTenantGroupPcode().equals(pageOcpTenantDto.getTenantGroupCode())){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.eq(OcpTenantGroup::getTenantGroupLevel,2); - tenantMapper.selectPage(pageInfo,queryWrapper); - } - } + List ocpTenantGroupList = tenantMapper.queryLike(keyword); + page.setRecords(ocpTenantGroupList); + tenantMapper.selectPage(page,qw); + return page; } - return pageInfo; - } + } } 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 diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..f2b742b93a95cd7f1400fd0bf86756d173e60779 --- /dev/null +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml index 4f38903c8bda00f8f1f0f5071fea72c920894b34..648f425279dd8a91ceea67d233f138eb8ba0d9d9 100644 --- a/src/main/resources/mapper/OcpTenantGroup.xml +++ b/src/main/resources/mapper/OcpTenantGroup.xml @@ -2,15 +2,29 @@ + + + - SELECT * FROM ocp_tenant_group WHERE tenant_group_code = #{tenant_group_company_pcode}; + + - + SELECT * FROM ocp_tenant_group WHERE tenant_group_company_code = #{tenantGroupCompanyCode}; + +