From 3e9e5ef04cb6d6c23efe0467da54b0491351e92b Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Wed, 9 Mar 2022 10:03:05 +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=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pms/ocp/common/config/PageParam.java | 32 ++++ .../ocp/controller/OcpApiTreeController.java | 10 +- .../com/pms/ocp/model/dto/PageGroupDto.java | 167 ++++++++++++++++++ .../pms/ocp/service/OcpApiTreeService.java | 19 +- .../service/impl/OcpApiTreeServiceImpl.java | 53 +++++- 5 files changed, 271 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/pms/ocp/model/dto/PageGroupDto.java diff --git a/src/main/java/com/pms/ocp/common/config/PageParam.java b/src/main/java/com/pms/ocp/common/config/PageParam.java index 1ce3405..3681cbf 100644 --- a/src/main/java/com/pms/ocp/common/config/PageParam.java +++ b/src/main/java/com/pms/ocp/common/config/PageParam.java @@ -18,4 +18,36 @@ public class PageParam { private int pageNum; private int pageSize; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public int getPageNum() { + return pageNum; + } + + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } } diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index dc0a3c7..ea8a4ce 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pms.ocp.common.config.PageParam; import com.pms.ocp.model.dto.ApiTreeGroupDto; import com.pms.ocp.model.dto.OcpApiGroupDtos; +import com.pms.ocp.model.dto.PageGroupDto; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.OcpApiTreeService; @@ -50,13 +51,20 @@ public class OcpApiTreeController { } - @GetMapping("/getone") + /*@GetMapping("/getone") @ApiOperation("服务树分类--分级数据") public List getOne(int pageSize,int pageNum,int apiGroupLevel){ List onePage = service.getOnePage(pageSize, pageNum, apiGroupLevel); return onePage; + }*/ + @PostMapping("/getone") + @ApiOperation("服务树分类--分级数据") + public Page getOne(@RequestBody PageGroupDto pageGroupDto){ + Page onePages = service.getOnePages(pageGroupDto); + return onePages; } + @PostMapping("/updatatree") @ApiOperation("服务树分类--修改") public ResponseVO updataTree(@RequestBody OcpApiGroup ocpApiGroup){ diff --git a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java new file mode 100644 index 0000000..de444dd --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java @@ -0,0 +1,167 @@ +package com.pms.ocp.model.dto; + +import com.pms.ocp.common.config.PageParam; +import io.swagger.annotations.ApiModelProperty; + +import java.sql.Timestamp; + +/** + * 分页查询dto + */ +public class PageGroupDto extends PageParam { + + + @ApiModelProperty("主键ID") + private String objId; + + @ApiModelProperty("分类编码") + private String apiGroupCode; + + @ApiModelProperty("分类名称") + private String apiGroupName; + + @ApiModelProperty("推广类型0统推，1自建") + private long apiGroupPromotionType; + + @ApiModelProperty("分类所属公司") + private String apiGroupCompanyCode; + + @ApiModelProperty("分类版本") + private String apiGroupVersion; + + @ApiModelProperty("显示顺序") + private long apiGroupOrderNo; + + @ApiModelProperty("提交人id") + private String apiGroupUserId; + + @ApiModelProperty("提交人姓名") + private String apiGroupUserName; + + @ApiModelProperty("创建时间") + private Timestamp apiGroupCtime; + + @ApiModelProperty("修改时间") + private Timestamp apiGroupMtime; + + @ApiModelProperty("上级code") + private String apiGroupPcode; + + @ApiModelProperty("是否删除0-否1-是") + private long isDelete; + + @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") + private long apiGroupLevel; + + public String getObjId() { + return objId; + } + + public void setObjId(String objId) { + this.objId = objId; + } + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + public String getApiGroupName() { + return apiGroupName; + } + + public void setApiGroupName(String apiGroupName) { + this.apiGroupName = apiGroupName; + } + + public long getApiGroupPromotionType() { + return apiGroupPromotionType; + } + + public void setApiGroupPromotionType(long apiGroupPromotionType) { + this.apiGroupPromotionType = apiGroupPromotionType; + } + + public String getApiGroupCompanyCode() { + return apiGroupCompanyCode; + } + + public void setApiGroupCompanyCode(String apiGroupCompanyCode) { + this.apiGroupCompanyCode = apiGroupCompanyCode; + } + + public String getApiGroupVersion() { + return apiGroupVersion; + } + + public void setApiGroupVersion(String apiGroupVersion) { + this.apiGroupVersion = apiGroupVersion; + } + + public long getApiGroupOrderNo() { + return apiGroupOrderNo; + } + + public void setApiGroupOrderNo(long apiGroupOrderNo) { + this.apiGroupOrderNo = apiGroupOrderNo; + } + + public String getApiGroupUserId() { + return apiGroupUserId; + } + + public void setApiGroupUserId(String apiGroupUserId) { + this.apiGroupUserId = apiGroupUserId; + } + + public String getApiGroupUserName() { + return apiGroupUserName; + } + + public void setApiGroupUserName(String apiGroupUserName) { + this.apiGroupUserName = apiGroupUserName; + } + + public Timestamp getApiGroupCtime() { + return apiGroupCtime; + } + + public void setApiGroupCtime(Timestamp apiGroupCtime) { + this.apiGroupCtime = apiGroupCtime; + } + + public Timestamp getApiGroupMtime() { + return apiGroupMtime; + } + + public void setApiGroupMtime(Timestamp apiGroupMtime) { + this.apiGroupMtime = apiGroupMtime; + } + + public String getApiGroupPcode() { + return apiGroupPcode; + } + + public void setApiGroupPcode(String apiGroupPcode) { + this.apiGroupPcode = apiGroupPcode; + } + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + public long getApiGroupLevel() { + return apiGroupLevel; + } + + public void setApiGroupLevel(long apiGroupLevel) { + this.apiGroupLevel = apiGroupLevel; + } +} diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java index 1dba98f..c388652 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -1,16 +1,14 @@ package com.pms.ocp.service; -import com.baomidou.mybatisplus.extension.api.R; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.common.config.PageParam; import com.pms.ocp.model.dto.ApiTreeGroupDto; import com.pms.ocp.model.dto.OcpApiGroupDtos; +import com.pms.ocp.model.dto.PageGroupDto; import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.vo.ResponseVO; -import java.util.List; + public interface OcpApiTreeService extends IService { @@ -38,11 +36,18 @@ public interface OcpApiTreeService extends IService { */ boolean deleteOcpTree(OcpApiGroup ocpApiGroup); - /** + /* *//** * 服务列表分级查询 * @param - */ - List getOnePage(int pageSize, int pageNum, int apiGroupLevel); + *//* + List getOnePage(int pageSize, int pageNum, int apiGroupLevel);*/ + + /** + * 服务列表分级查询 + * @param pageGroupDto + * @return + */ + Page getOnePages(PageGroupDto pageGroupDto); } 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 968a28d..f7ffe16 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -234,11 +234,13 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getOnePage(int pageSize, int pageNum, int apiGroupLevel) { @@ -247,6 +249,53 @@ public class OcpApiTreeServiceImpl extends ServiceImpl eq = queryWrapper.eq(OcpApiGroup::getApiGroupLevel, apiGroupLevel); List ocpApiGroups = mapper.selectList(eq); return ocpApiGroups; + }*/ + + /** + * 服务列表分级查询 + * + * @param pageGroupDto + * @return + */ + @Override + public Page 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() == 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); + } + } + + } + return pageInfo; + } -- 2.26.0