From b7bef58f771c65c45f087fdff63b3e5254f346d7 Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Fri, 18 Mar 2022 15:30:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=B5=E5=91=88=E6=98=8E=20--=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=A0=91=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocp/controller/OcpApiTreeController.java | 8 +- .../com/pms/ocp/mapper/OcpApiTreeMapper.java | 2 +- .../com/pms/ocp/model/dto/PageGroupDto.java | 12 +++ .../com/pms/ocp/model/dto/TenanBaseDto.java | 99 ++++++++++++++++- .../pms/ocp/model/entity/OcpTenantGroup.java | 5 + .../pms/ocp/service/OcpApiTreeService.java | 2 +- .../service/impl/OcpApiTreeServiceImpl.java | 101 ++++++++++-------- .../ocp/service/impl/TenantServiceImpl.java | 3 +- 8 files changed, 178 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index 22cdc6b..88c157d 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -43,11 +43,8 @@ public class OcpApiTreeController { @PostMapping("/instertree") @ApiOperation("服务树分类--新增") public ResponseVO inseter(@RequestBody OcpApiGroup ocpApiGroup){ - boolean flag = service.insertTree(ocpApiGroup); - if (flag){ - return ResponseVO.ok(); - } - return ResponseVO.error("您的服务编码重复,请重新输入"); + OcpApiGroup ocpApiGroup1 = service.insertTree(ocpApiGroup); + return ResponseVO.ok(ocpApiGroup1); } @@ -58,7 +55,6 @@ public class OcpApiTreeController { return ResponseVO.ok(onePages); } - @PostMapping("/updatatree") @ApiOperation("服务树分类--修改") public ResponseVO updataTree(@RequestBody OcpApiGroup ocpApiGroup){ diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java index 02ad59a..082d546 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java @@ -32,7 +32,7 @@ public interface OcpApiTreeMapper extends BaseMapper { List selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode); - List selectLists(Long apiGroupPromotionType, String apiGroupCode,String apiGroupLevel); + List selectLists(Long apiGroupPromotionType, String apiGroupCode); //code重复问题 List selectGroupCode(); diff --git a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java index 2395d25..b48ed5f 100644 --- a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java +++ b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java @@ -53,6 +53,18 @@ public class PageGroupDto extends PageParam { @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") private String apiGroupLevel; + + @ApiModelProperty("模糊查询字段") + private String keyword; + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + public String getObjId() { return objId; } diff --git a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java index 3c3c771..b30ca9e 100644 --- a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java @@ -131,7 +131,104 @@ public class TenanBaseDto extends OcpTenantGroup { return classIfy; } - public void setClassIfy(String classIfy) { + 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 Timestamp getTenantGroupCtime() { + return tenantGroupCtime; + } + + public void setTenantGroupCtime(Timestamp tenantGroupCtime) { + this.tenantGroupCtime = tenantGroupCtime; + } + + public Timestamp getTenantGroupMtime() { + return tenantGroupMtime; + } + + public void setTenantGroupMtime(Timestamp tenantGroupMtime) { + this.tenantGroupMtime = tenantGroupMtime; + } + + public Short getIsDelete() { + return isDelete; + } + + public void setIsDelete(Short isDelete) { + this.isDelete = isDelete; + } + + public String getTenantGroupLevel() { + return tenantGroupLevel; + } + + public void setTenantGroupLevel(String tenantGroupLevel) { + this.tenantGroupLevel = tenantGroupLevel; + } + + public OcpTenantGroup setClassIfy(String classIfy) { this.classIfy = classIfy; + return null; } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java index 1aa6664..d23be91 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java @@ -1,6 +1,7 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -106,7 +107,11 @@ public class OcpTenantGroup implements Serializable { @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") private String tenantGroupLevel; + //上级分类名称 + @ApiModelProperty("上级分类名称") + @TableField(exist = false) + private String classIfy; public static long getSerialVersionUID() { return serialVersionUID; diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java index 6f59c30..7fd9f90 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -19,7 +19,7 @@ public interface OcpApiTreeService extends IService { /** * 新增服务分类 */ - boolean insertTree(OcpApiGroup ocpApiGroup); + OcpApiGroup insertTree(OcpApiGroup ocpApiGroup); /* 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 b54d006..dcc5000 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.utils.RandomStringUtils; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; +import com.pms.ocp.model.QueryResponseResult; import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.OcpApiTreeService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -25,7 +27,7 @@ import java.util.stream.Stream; @Service @Slf4j -public class OcpApiTreeServiceImpl extends ServiceImpl implements OcpApiTreeService { +public class OcpApiTreeServiceImpl extends ServiceImpl implements OcpApiTreeService { @Autowired @@ -41,19 +43,19 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getByGroup(Long apiGroupPromotionType,String apiGroupCode) { - - 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; + public List getByGroup(Long apiGroupPromotionType, String apiGroupCode) { + + 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; + } + /** * 新增服务分类 @@ -61,35 +63,35 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); - Stream ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode())); - Stream apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName())); - if (!(apiGroupStream1.isParallel())){ - OcpApiGroup ocpApi = new OcpApiGroup(); - BeanUtils.copyProperties(ocpApiGroup,ocpApi); + Stream ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode())); + Stream apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName())); + OcpApiGroup ocpApi = new OcpApiGroup(); + if (!(StringUtils.isBlank(apiGroupStream1.toString()))) { + ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType()); + BeanUtils.copyProperties(ocpApiGroup, ocpApi); ocpApi.setObjId(""); ocpApi.setApiGroupMtime(timestamp); ocpApi.setApiGroupCtime(timestamp); ocpApi.setApiGroupPcode(ocpApiGroup.getApiGroupCode()); ocpApi.setApiGroupCode(code); - if(ocpApiGroup.getApiGroupLevel().equals("Middleground")){ + ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType()); + if ("Middleground".equals(ocpApiGroup.getApiGroupLevel())) { ocpApiGroup.setApiGroupLevel("sys_center"); } - if(ocpApiGroup.getApiGroupLevel().equals("sys_center")){ + if ("sys_center".equals(ocpApiGroup.getApiGroupLevel())) { ocpApiGroup.setApiGroupLevel("api_group"); } - mapper.insert(ocpApi); - - }else { - return false; + } else { + return ocpApi; } - return flag; + return ocpApi; } @@ -123,18 +125,21 @@ public class OcpApiTreeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OcpApiGroup::getApiGroupCode, ocpApiGroup.getApiGroupCode()); String objId = ocpApiGroup.getObjId(); - OcpApiGroup ocpApiGroup1 = mapper.selectById(objId); - List ocpApiGroups = mapper.selectList(null); - for (OcpApiGroup apiGroup : ocpApiGroups) { - if ((ocpApiGroup1.getApiGroupCode()).equals(apiGroup.getApiGroupPcode())){ - flag = false; - break; - } + if (StringUtils.isBlank(ocpApiGroup.getApiGroupCode())) { + flag = false; + } else { + + LambdaQueryWrapper eq = queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode()); + if (StringUtils.isBlank(eq.toString())) { + flag = false; + } } - if (flag){ + if (flag) { mapper.deleteById(objId); } return flag; @@ -149,17 +154,27 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getOnePages(PageGroupDto pageGroupDto) { - Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize()); - if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); - lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); - pageInfo = mapper.selectPage(pageInfo,lambdaQueryWrapper); - }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){ - List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel()); - pageInfo.setRecords(ocpApiGroups); - pageInfo = mapper.selectPage(pageInfo, null); + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + if (!("".equals(pageGroupDto.getKeyword()))) { + if (StringUtils.isBlank(pageGroupDto.getApiGroupLevel())) { + + qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); + mapper.selectPage(pageInfo, qw); + + } else if ("Middleground".equals(pageGroupDto.getApiGroupLevel()) || "sys_center".equals(pageGroupDto.getApiGroupLevel()) || "api_group".equals(pageGroupDto.getApiGroupLevel())) { + List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode()); + pageInfo.setRecords(ocpApiGroups); + pageInfo.setTotal(ocpApiGroups.size()); + } + } else { + LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword())) + .or().like(OcpApiGroup::getApiGroupUserName, pageGroupDto.getKeyword()) + .or().like(OcpApiGroup::getApiGroupPcode, pageGroupDto.getKeyword()); + mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper); } 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 fbfdd58..a12e55b 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -86,8 +86,7 @@ public class TenantServiceImpl extends ServiceImpl if (tenanBaseDto.getTenantGroupLevel().equals("sys_center")){ group.setTenantGroupLevel("api_group"); } - - + group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode()); //判断是否含有相同的分类名称 if (falg) { -- 2.26.0