From bf3f53c1ccdaa0bbdcac107c140cda92aa7f118a Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Tue, 8 Mar 2022 20:57:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=B5=E5=91=88=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocp/controller/OcpApiTreeController.java | 13 +- .../pms/ocp/model/dto/OcpApiGroupDtos.java | 6 + .../com/pms/ocp/model/dto/TwoDownList.java | 2 + .../com/pms/ocp/model/entity/OcpApiGroup.java | 7 + .../pms/ocp/service/OcpApiTreeService.java | 15 +- .../service/impl/OcpApiTreeServiceImpl.java | 174 +++++++++++------- 6 files changed, 145 insertions(+), 72 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index 9dd161d..dc0a3c7 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -1,9 +1,10 @@ package com.pms.ocp.controller; +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.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.OcpApiTreeService; @@ -13,6 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @Slf4j @RequestMapping("/api-group/v1") @@ -46,6 +49,14 @@ public class OcpApiTreeController { return ResponseVO.error("您的服务编码重复,请重新输入"); } + + @GetMapping("/getone") + @ApiOperation("服务树分类--分级数据") + public List getOne(int pageSize,int pageNum,int apiGroupLevel){ + List onePage = service.getOnePage(pageSize, pageNum, apiGroupLevel); + return onePage; + } + @PostMapping("/updatatree") @ApiOperation("服务树分类--修改") public ResponseVO updataTree(@RequestBody OcpApiGroup ocpApiGroup){ diff --git a/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java b/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java index 168231d..b18dfaa 100644 --- a/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java +++ b/src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java @@ -11,6 +11,12 @@ import java.sql.Timestamp; @Data public class OcpApiGroupDtos { + + @ApiModelProperty(value = "当前页码") + private int pageSize; + @ApiModelProperty(value = "每页大小") + private int pageNum; + @ApiModelProperty("分类编码") private String apiGroupCode; diff --git a/src/main/java/com/pms/ocp/model/dto/TwoDownList.java b/src/main/java/com/pms/ocp/model/dto/TwoDownList.java index f99062c..29be13f 100644 --- a/src/main/java/com/pms/ocp/model/dto/TwoDownList.java +++ b/src/main/java/com/pms/ocp/model/dto/TwoDownList.java @@ -14,6 +14,7 @@ import java.util.List; @ApiModel(value = "中心层") @Data public class TwoDownList { + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private String objId; @@ -57,6 +58,7 @@ public class TwoDownList { @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") private long apiGroupLevel; + public long getApiGroupLevel() { return apiGroupLevel; } 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 784152c..b157962 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java @@ -58,7 +58,13 @@ public class OcpApiGroup { private long apiGroupLevel; + public long getApiGroupLevel() { + return apiGroupLevel; + } + public void setApiGroupLevel(long apiGroupLevel) { + this.apiGroupLevel = apiGroupLevel; + } public String getObjId() { return objId; @@ -176,4 +182,5 @@ public class OcpApiGroup { this.isDelete = isDelete; } + } diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java index 1556ba6..1dba98f 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -1,11 +1,16 @@ 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.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.vo.ResponseVO; + +import java.util.List; public interface OcpApiTreeService extends IService { @@ -32,4 +37,12 @@ public interface OcpApiTreeService extends IService { * 删除服务分类 */ boolean deleteOcpTree(OcpApiGroup ocpApiGroup); + + /** + * 服务列表分级查询 + * @param + */ + List getOnePage(int pageSize, int pageNum, int apiGroupLevel); + + } 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 17ed992..968a28d 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -1,15 +1,22 @@ package com.pms.ocp.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.api.R; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.common.config.PageParam; import com.pms.ocp.common.utils.RandomStringUtil; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.OcpApiTreeService; -import org.apache.commons.lang3.RandomStringUtils; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,9 +24,11 @@ import org.springframework.stereotype.Service; import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; @Service +@Slf4j public class OcpApiTreeServiceImpl extends ServiceImpl implements OcpApiTreeService { @@ -31,15 +40,17 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); + //服务树分类对象 ApiTreeGroupDto apiTreeGroupList = new ApiTreeGroupDto(); //1中台层 @@ -52,127 +63,137 @@ public class OcpApiTreeServiceImpl extends ServiceImpl 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; + return apiTreeGroupList; } /** * 2中心层 + * * @param oneTreeUpLists * @return */ - public List twoTreeLists(List oneTreeUpLists,List ocpApiGroups){ + public List twoTreeLists(List oneTreeUpLists, List ocpApiGroups) { - List twolists = new ArrayList<>(); + /* List groupList = new ArrayList<>();*/ List twoTreeLists = new ArrayList<>(); for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (!(ocpApiGroup.getIsDelete() == 0)){ - if (ocpApiGroup.getApiGroupLevel() == 2){ - twolists.add(ocpApiGroup); - }else { + TwoDownList twoDownList = new TwoDownList(); + if (!(ocpApiGroup.getIsDelete() == 0)) { + if (ocpApiGroup.getApiGroupLevel() == 2) { + BeanUtils.copyProperties(ocpApiGroup, twoDownList); + twoTreeLists.add(twoDownList); + } else { continue; } } } - BeanUtils.copyProperties(twolists,twoTreeLists); + return twoTreeLists; } + /** * 3服务组层 + * * @param twoDownLists * @return */ - public List threeTreeLists(List twoDownLists,List ocpApiGroups){ + public List threeTreeLists(List twoDownLists, List ocpApiGroups) { List threeTreeLists = new ArrayList<>(); - List threeLists = new ArrayList<>(); - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (!(ocpApiGroup.getIsDelete() == 0)) { - if (ocpApiGroup.getApiGroupLevel() == 3){ - threeLists.add(ocpApiGroup); - } - }else { - continue; + for (OcpApiGroup ocpApiGroup : ocpApiGroups) { + ThreeTreeList threeTreeList = new ThreeTreeList(); + if (!(ocpApiGroup.getIsDelete() == 0)) { + if (ocpApiGroup.getApiGroupLevel() == 3) { + BeanUtils.copyProperties(ocpApiGroup, threeTreeList); + threeTreeLists.add(threeTreeList); } - BeanUtils.copyProperties(threeLists,threeTreeLists); + } else { + continue; + } + } return threeTreeLists; } + /** * 4服务层 + * * @param threeTreeLists * @return */ - public List fourTreeLists(List threeTreeLists,List ocpApiGroups){ + public List fourTreeLists(List threeTreeLists, List ocpApiGroups) { List foureTreeList = new ArrayList<>(); - List foureLists = new ArrayList<>(); for (OcpApiGroup ocpApiGroup : ocpApiGroups) { + FourTreeList fourTreeList = new FourTreeList(); if (!(ocpApiGroup.getIsDelete() == 0)) { - if (ocpApiGroup.getApiGroupLevel() == 4){ - foureLists.add(ocpApiGroup); + if (ocpApiGroup.getApiGroupLevel() == 4) { + BeanUtils.copyProperties(fourTreeList, foureTreeList); + foureTreeList.add(fourTreeList); } - }else { + } else { continue; } - BeanUtils.copyProperties(foureLists,foureTreeList); + } return foureTreeList; } - /** - * 新增服务分类 - * - * @param ocpApiGroupDtos - */ - @Override - public boolean insertTree(OcpApiGroupDtos ocpApiGroupDtos) { - - - String code = RandomStringUtil.getRandomString(6); - boolean flag = true; - List ocpApiGroups = mapper.selectList(null); - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (ocpApiGroup.getApiGroupCode().equals(ocpApiGroupDtos.getApiGroupCode())){ - flag = false; - break; - } - } - if (flag == true) { - OcpApiBase ocpApiBase = new OcpApiBase(); - ocpApiBase.setApiCode(ocpApiGroupDtos.getApiGroupCode()); - BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiBase); - ocpApiBase.setApiGroupCode(code); - ocpApiBase.setApiName("新增服务分类"); - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - ocpApiBase.setApiMtime(timestamp); - ocpApiBase.setApiCtime(ocpApiGroupDtos.getApiGroupCtime()); - ocpApiBase.setApiUserId(ocpApiGroupDtos.getApiGroupUserId()); - ocpApiBase.setObjId(""); - OcpApiGroup ocpApiGroup1 = new OcpApiGroup(); - ocpApiGroup1.setObjId(""); - BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1); - ocpApiGroup1.setApiGroupCode(code); - ocpApiBaseMapper.insert(ocpApiBase); - mapper.insert(ocpApiGroup1); + /** + * 新增服务分类 + * + * @param ocpApiGroupDtos + */ + @Override + public boolean insertTree(OcpApiGroupDtos ocpApiGroupDtos) { + + String code = RandomStringUtil.getRandomString(6); + boolean flag = true; + List ocpApiGroups = mapper.selectList(null); + for (OcpApiGroup ocpApiGroup : ocpApiGroups) { + if (ocpApiGroup.getApiGroupCode().equals(ocpApiGroupDtos.getApiGroupCode())) { + flag = false; + break; } - return flag; + } + if (flag == true) { + OcpApiBase ocpApiBase = new OcpApiBase(); + ocpApiBase.setApiCode(ocpApiGroupDtos.getApiGroupCode()); + BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiBase); + ocpApiBase.setApiGroupCode(code); + ocpApiBase.setApiName("新增服务分类"); + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + ocpApiBase.setApiMtime(timestamp); + ocpApiBase.setApiCtime(ocpApiGroupDtos.getApiGroupCtime()); + ocpApiBase.setApiUserId(ocpApiGroupDtos.getApiGroupUserId()); + ocpApiBase.setObjId(""); + OcpApiGroup ocpApiGroup1 = new OcpApiGroup(); + ocpApiGroup1.setObjId(""); + BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1); + ocpApiGroup1.setApiGroupCode(code); + ocpApiBaseMapper.insert(ocpApiBase); + mapper.insert(ocpApiGroup1); } + return flag; + + } /** @@ -186,7 +207,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); for (OcpApiGroup apiGroup : ocpApiGroups) { String code = apiGroup.getApiGroupCode(); - if (code == ocpApiGroup.getApiGroupCode()){ + if (code == ocpApiGroup.getApiGroupCode()) { falg = false; break; } @@ -196,7 +217,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; } + } -- 2.26.0