diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index c8970bceac853cbc268841fef9a8584889113e02..3f8cb3d7090051d1132d6c13e24edce8aaa728a4 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -2,11 +2,10 @@ 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.PageGroupDto; import com.pms.ocp.model.dto.TenanBaseDto; import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.TenantService; @@ -71,11 +70,19 @@ public class OcpTenantController { } - @PostMapping("tenantone") - @ApiOperation("应用分类--分级数据") - public ResponseVO> tenantOne(@RequestBody PageGroupDto pageGroupDto){ -// Page onePages = tenantService.getOnePages(pageGroupDto); - return ResponseVO.ok(); + @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/model/dto/PageOcpTenantDto.java b/src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java new file mode 100644 index 0000000000000000000000000000000000000000..f944df1e6140c00a4ea8f4d834eaf283aba0ef33 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/PageOcpTenantDto.java @@ -0,0 +1,237 @@ +package com.pms.ocp.model.dto; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.pms.ocp.common.config.PageParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.sql.Timestamp; + +/** + * 分级查询dto + */ +@ApiModel("分级查询dto") +public class PageOcpTenantDto { + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty("主键") + private String objId; + + + private int pageNum; + + private int pageSize; + + + 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; + } + + /** + * 应用分类编码 + */ + @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 Timestamp tenantGroupCtime; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private Timestamp 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 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 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 Short getTenantGroupLevel() { + return tenantGroupLevel; + } + + public void setTenantGroupLevel(Short tenantGroupLevel) { + this.tenantGroupLevel = tenantGroupLevel; + } +} diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java index bdaa9866ecdf3a0918a1dad0437a2e8e871462cd..de1ac0edd0020f45e295f0a1db6b87edcd146df2 100644 --- a/src/main/java/com/pms/ocp/service/TenantService.java +++ b/src/main/java/com/pms/ocp/service/TenantService.java @@ -5,9 +5,11 @@ 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.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantGroup; +import com.pms.ocp.model.vo.ResponseVO; import java.util.List; @@ -44,4 +46,17 @@ public interface TenantService extends IService { boolean gettenantDelete(OcpTenantGroup ocpTenantGroup); + /** + * 应用分类--应用管理 + * @param ocpTenantDto + * @return + */ + List getsUse(PageOcpTenantDto ocpTenantDto); + + /** + * 应用分类--应用服务分页查 + * @param pageOcpTenantDto + * @return + */ + Page getOnePages(PageOcpTenantDto pageOcpTenantDto); } 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 fb73034bde724de68255f93bebd26fb42abc6f9c..6b3df04331e74c2316fbbcab46225fbc2f5ce3e1 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -275,7 +275,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (pageGroupDto.getApiGroupCode() == ocpApiGroup.getApiGroupCode()){ + if (pageGroupDto.getApiGroupCode().equals(ocpApiGroup.getApiGroupCode())){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(OcpApiGroup::getApiGroupLevel, pageGroupDto.getApiGroupLevel()); mapper.selectPage(pageInfo,queryWrapper); 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 6b863611d9f0abb3b05f531794a0f29f399fa1dd..1ecc1c1188ed04788646f9ab42d7bab11ad959ab 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -2,6 +2,9 @@ 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.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.utils.RandomStringUtil; import com.pms.ocp.mapper.TenantBasicManagementMapper; @@ -187,4 +190,65 @@ public class TenantServiceImpl extends ServiceImpl return flag; } + /** + * 应用分类--应用管理 + * + * @param ocpTenantDto + * @return + */ + @Override + public List getsUse(PageOcpTenantDto ocpTenantDto) { + + 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; + } + 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 { + 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); + } + } + } + return pageInfo; + } + }