diff --git a/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java b/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java index 40c89cd5db23af686181c8361bb62c3a0fd7a50a..acde305f650e509820123a4a63b6163968a7283b 100644 --- a/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java +++ b/src/main/java/com/pms/ocp/common/utils/RandomStringUtils.java @@ -17,6 +17,7 @@ public class RandomStringUtils { String str="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; Random random=new Random(); StringBuffer sb=new StringBuffer(); + for(int i=0;i> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType); + public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType,String apiCode,String apiPromotion) { + List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType,apiCode,apiPromotion); return ResponseVO.ok(apiTreeGroupDtos); } diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index f7e5dadc95d81e49c949b7265c642ed9f910333e..07d403f5440e11cc689efcbc444ae51bb6c6662e 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -1,6 +1,5 @@ package com.pms.ocp.controller; - import com.github.pagehelper.PageInfo; import com.pms.ocp.model.dto.*; @@ -21,6 +20,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.sql.Timestamp; import java.util.List; + /** * @author guofanfan */ @@ -86,12 +86,24 @@ public class TenantBasicManagementController { @ApiOperation("应用树层级") @GetMapping("/tenantBaseTreeOther") - public ResponseVO> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode + public ResponseVO> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode, + @RequestParam(required = false) String tenantCode ) { - List ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); + List ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode,tenantCode); +// if (ocpApiGroups.size() != 0) { +// return ResponseVO.ok(ocpApiGroups); +// } else { +// List ocpBaseGroupDto = tenantBasicManagementService.selectBase(tenantGroupCode, tenantGroupCompanyCode); +// +// } return ResponseVO.ok(ocpApiGroups); } + /** + * @param tenantGroupCode + * @param tenantGroupCompanyCode + * @return + */ @ApiOperation("应用树底层") @GetMapping("/tenantBaseTree") public ResponseVO> tenantBaseTree(@RequestParam(required = false) String tenantGroupCode, diff --git a/src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java b/src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java index d879203064ae0381b3843f21f31093279dcc408e..29e23065ee7304d4a8c9f1f7d699b7800eaa1410 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelSubscribeMapper.java @@ -19,5 +19,7 @@ public interface ModelSubscribeMapper extends BaseMapper { List selectOrganData(); - List selectModelAndModelGroup(@Param("searchCondition") String searchCondition); + List selectModelAndModelGroup(); + + List getModelList(@Param("searchCondition") String searchCondition); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java index 7b68d58034435ddf8842817a40a7c8c5e1a8b5c1..ef9b7fff7dd03c54a3825e7ef77a1c9207d32e54 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java @@ -2,6 +2,7 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pms.ocp.model.dto.ApiBaseDto; +import com.pms.ocp.model.dto.OcpGroupBaseDto; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.vo.OcpApiBaseVo; @@ -21,5 +22,9 @@ public interface OcpApiGroupMapper extends BaseMapper { List selectPageLists(ApiBaseDto apiBaseReq); + List apiTree(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType,String apiPromotion); + + List selectBase(String apiGroupCompanyCode, String apiGroupPcode,String apiPromotion); + // List queryApiTreeData1(); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java index 082d54642a9f18840a5e2ce5f53f9b3a16085d76..e6e5845c53e6c9873ec71a7967a4f7842881ffff 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java @@ -39,4 +39,7 @@ public interface OcpApiTreeMapper extends BaseMapper { //根据code查询整条数据 OcpApiGroup selectCode(String code); + + //根据code查询是否=含有下级服务 + List selectGroupPcode(); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java index 70e6d44570f825314ec0bdaf884419863b0ede97..d5169f7c05991a19613ab67ba16785e2a232cb7c 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java @@ -3,10 +3,11 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pms.ocp.model.dto.GroupDto; + import com.pms.ocp.model.dto.OcpTenantBaseDto; import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.entity.OcpTenantGroup; -import com.pms.ocp.model.vo.ResponseVO; + import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,4 +20,6 @@ public interface OcpTenantGroupMapper extends BaseMapper { List selectPageLists(TenantDto tenantDto); OcpTenantGroup selectRegister(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupCompanyCode") String tenantGroupCompanyCode); + + List selectBase(@Param("tenantGroupCode") String tenantGroupCode, String tenantGroupCompanyCode); } diff --git a/src/main/java/com/pms/ocp/model/dto/GroupDto.java b/src/main/java/com/pms/ocp/model/dto/GroupDto.java index 827dc28b127d9c1d0244b86d8fdf191eac1372b3..8a02bbbcd85ee26e27e9241c8725d0f27fb7286e 100644 --- a/src/main/java/com/pms/ocp/model/dto/GroupDto.java +++ b/src/main/java/com/pms/ocp/model/dto/GroupDto.java @@ -23,6 +23,10 @@ public class GroupDto extends OcpTenantGroup implements Serializable { @ApiModelProperty("应用代码") private String tenantCode; + @ApiModelProperty("flag") + private Integer flag; + + /** * 应用分类代码 */ diff --git a/src/main/java/com/pms/ocp/model/dto/OcpGroupBaseDto.java b/src/main/java/com/pms/ocp/model/dto/OcpGroupBaseDto.java new file mode 100644 index 0000000000000000000000000000000000000000..dd28cd35ccd8b91f859e0b98b0d312a0adf2fb0d --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/OcpGroupBaseDto.java @@ -0,0 +1,27 @@ +package com.pms.ocp.model.dto; + +import com.pms.ocp.model.entity.OcpApiGroup; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author guofanfan + * 服务组dto + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class OcpGroupBaseDto extends OcpApiGroup implements Serializable { + @ApiModelProperty("服务代码") + private String apiCode; + + @ApiModelProperty("服务接口中文名称") + private String apiName; + + @ApiModelProperty("服务分类代码") + private String apiGroupCode; +} 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 b48ed5f3ccd7d2846160183999a0495f48c0e606..fd6d316edfd7e36863a7bafdfa0057584e4e40a8 100644 --- a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java +++ b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java @@ -8,7 +8,7 @@ import java.sql.Timestamp; /** * 分页查询dto */ -public class PageGroupDto extends PageParam { +public class PageGroupDto{ @ApiModelProperty("主键ID") @@ -57,6 +57,29 @@ public class PageGroupDto extends PageParam { @ApiModelProperty("模糊查询字段") private String keyword; + + @ApiModelProperty("分页条数") + private int currentPage; + + @ApiModelProperty("分页树") + private int pageSize; + + public int getCurrentPage() { + return currentPage; + } + + public void setCurrentPage(int currentPage) { + this.currentPage = currentPage; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + public String getKeyword() { return keyword; } 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 93327b7214e3d8fce077fc9a6c2b4dfd4214d122..fef5c89b6775c0495e12cf446e3700f032cd348a 100644 --- a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java @@ -4,7 +4,6 @@ package com.pms.ocp.model.dto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.pms.ocp.common.constants.StringUtils; import com.pms.ocp.model.entity.OcpTenantGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java index 3be93a479590d314123bb21b1f2ada827fa69b84..463432aa636924c7e333467f661d18a2cf790464 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelClassify.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java @@ -10,6 +10,7 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; +import java.util.List; /** * @Auther: wangjian @@ -83,4 +84,6 @@ public class ModelClassify { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date groupUpdateTime; + @TableField(exist = false) + private List childrenList; } 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 d306c59edf2ca21e768a394039a95237a87bfa01..29f1e757e245299e07fb5fbbddd3694802de6249 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java @@ -60,6 +60,19 @@ public class OcpApiGroup { @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") private String apiGroupLevel; + + @ApiModelProperty("上级分类名称") + @TableField(exist = false) + private String classIfy; + + public String getClassIfy() { + return classIfy; + } + + public void setClassIfy(String classIfy) { + this.classIfy = classIfy; + } + public String getApiGroupLevel() { return apiGroupLevel; } diff --git a/src/main/java/com/pms/ocp/model/entity/TreeNode.java b/src/main/java/com/pms/ocp/model/entity/TreeNode.java index a4de34f89939b1f64df9e0325ed1008f9dc10241..a0aa1cefc2fd50d3b6ef881580235c4cefd817c4 100644 --- a/src/main/java/com/pms/ocp/model/entity/TreeNode.java +++ b/src/main/java/com/pms/ocp/model/entity/TreeNode.java @@ -34,6 +34,9 @@ public class TreeNode implements Serializable { @ApiModelProperty("公司编码") private String companyCode; + @ApiModelProperty("子类") + private String modelGroupCode; + @ApiModelProperty("子类") private int belongLevel; @@ -52,4 +55,7 @@ public class TreeNode implements Serializable { return companyCode == null ? "":companyCode; } + public String getModelGroupCode() { + return modelGroupCode == null ? "":modelGroupCode; + } } diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index 634d166088f020f52789cdb3baeacc52dfe0bbcb..3576226a01bac9a698d71c0598823beb9c7b6ff9 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -3,10 +3,7 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pms.ocp.model.QueryResponseResult; -import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.dto.ApiTreeGroupDto; -import com.pms.ocp.model.dto.OcpApiBaseDto; -import com.pms.ocp.model.dto.WholeLinkParamDto; +import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiExtent; import com.pms.ocp.model.entity.OcpApiGroup; @@ -75,7 +72,7 @@ public interface ApiBasicManagementService extends IService { * @param apiGroupPcode * @return */ - List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType); + List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode,String apiPromotion); /** * 根据分组code获取列表 diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index 3a35a3ab4b9b32cc3ba92f3966b5d4a3b187c668..e78eecd2aa6b6adf6773a10d494ccf014d931caa 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -2,10 +2,7 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; -import com.pms.ocp.model.dto.GroupDto; -import com.pms.ocp.model.dto.OcpTenantBaseDto; -import com.pms.ocp.model.dto.TenantDto; -import com.pms.ocp.model.dto.WholeLinkParamDto; +import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantGroup; @@ -64,7 +61,7 @@ public interface TenantBasicManagementService extends IService { * @param tenantGroupCompanyCode * @return */ - List tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode); + List tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode,String tenantCode); /** * 应用列表 @@ -91,6 +88,14 @@ public interface TenantBasicManagementService extends IService { */ OcpTenantGroup selectRegister(String tenantGroupCode, String tenantGroupCompanyCode); + /** + * 查询基础表 + * @param tenantGroupCode + * @param tenantGroupCompanyCode + * @return + */ + List selectBase(String tenantGroupCode, String tenantGroupCompanyCode); + /** * 应用树 * @param tenantGroupCode diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java index e00a23b9cae518feafc32bdf09bde67b91120bbb..b7a047fb5e26a4b116a5523b7be4b322739f0554 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -2,24 +2,21 @@ 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.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.pms.ocp.common.constants.StringUtils; -import com.pms.ocp.common.exception.BeagleException; -import com.pms.ocp.common.utils.MenuTree; + + import com.pms.ocp.mapper.ApiBasicManagementMapper; import com.pms.ocp.mapper.OcpApiExtentMapper; import com.pms.ocp.mapper.OcpApiGroupMapper; import com.pms.ocp.mapper.OcpApiSubsMapper; -import com.pms.ocp.model.CommonCode; -import com.pms.ocp.model.QueryResponseResult; + import com.pms.ocp.model.dto.ApiBaseDto; -import com.pms.ocp.model.dto.OcpApiBaseDto; -import com.pms.ocp.model.dto.WholeLinkParamDto; + +import com.pms.ocp.model.dto.OcpGroupBaseDto; + import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiExtent; import com.pms.ocp.model.entity.OcpApiGroup; @@ -29,7 +26,7 @@ import com.pms.ocp.model.vo.*; import com.pms.ocp.service.ApiBasicManagementService; import com.pms.ocp.service.OcpApiExtentService; - +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,6 +36,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -57,6 +55,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl apiGroupCode = new ArrayList<>(); + /** * 导出查询 * @@ -98,6 +97,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType) { - List ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode,apiGroupPromotionType); - return ocpApiGroups; + public List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType, String apiCode, String apiPromotion) { + List ocpApiGroups = ocpApiGroupMapper.apiTree(apiGroupCompanyCode, apiGroupPcode, apiGroupPromotionType, apiPromotion); + if (ocpApiGroups.size() != 0) { + return ocpApiGroups; + } else { + if (StringUtils.isNotEmpty(apiCode)) { + return Collections.EMPTY_LIST; + } else { + List ocpGroupBaseDto = ocpApiGroupMapper.selectBase(apiGroupCompanyCode, apiGroupPcode, apiPromotion); + if (ocpGroupBaseDto.size() != 0) { + return ocpGroupBaseDto; + } + return Collections.EMPTY_LIST; + } + } + } @Override public ResponseVO> getBaseByGroupCode(ApiBaseDto apiBaseReq) { if (apiBaseReq.getPageNum() == null || apiBaseReq.getPageSize() == null) { - return ResponseVO.error("分页参数不能为空"); + return ResponseVO.error("分页参数不能为空"); } apiGroupCode.add(apiBaseReq.getApiGroupCode()); - setGroupIdValue(apiBaseReq.getApiGroupCompanyCode() ,apiBaseReq.getApiGroupCode(),apiBaseReq.getApiPromotion()); - PageHelper.startPage(apiBaseReq.getPageNum(),apiBaseReq.getPageSize()); + setGroupIdValue(apiBaseReq.getApiGroupCompanyCode(), apiBaseReq.getApiGroupCode(), apiBaseReq.getApiPromotion()); + PageHelper.startPage(apiBaseReq.getPageNum(), apiBaseReq.getPageSize()); apiBaseReq.setApiGroupCodeList(apiGroupCode); List ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq); apiGroupCode.clear(); @@ -207,7 +219,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl codes = getIdsByPIdPub(apiGroupCompanyCode,code,apiGroupPromotionType); - if(codes.size()>0){ - for (String cod : codes ){ - setGroupIdValue(apiGroupCompanyCode,cod,apiGroupPromotionType); + private void setGroupIdValue(String apiGroupCompanyCode, String code, Integer apiGroupPromotionType) { + List codes = getIdsByPIdPub(apiGroupCompanyCode, code, apiGroupPromotionType); + if (codes.size() > 0) { + for (String cod : codes) { + setGroupIdValue(apiGroupCompanyCode, cod, apiGroupPromotionType); apiGroupCode.add(cod); - }; + } + ; } } /** * pcode服务分组 + * * @param apiGroupCompanyCode * @param code * @return */ - public List getIdsByPIdPub(String apiGroupCompanyCode,String code,Integer apiGroupPromotionType) { - List ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode, code,apiGroupPromotionType); + public List getIdsByPIdPub(String apiGroupCompanyCode, String code, Integer apiGroupPromotionType) { + List ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode, code, apiGroupPromotionType); return ocpApiGroups.stream().map(OcpApiGroup::getApiGroupCode).collect(Collectors.toList()); } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java index cecac406f731a986328e7ec3b7a7ce81e429cc44..30433cfb28ea49a1492b910c79863543e0caa880 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelSubscribeServiceImpl.java @@ -18,6 +18,7 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.LinkedList; import java.util.List; +import java.util.function.BiFunction; /** * @Auther: wangjian @@ -99,18 +100,31 @@ public class ModelSubscribeServiceImpl implements ModelSubscribeService { @Override public ResponseVO modelListNavigation(String searchCondition) { //查询模型和模型属性表列表 - List modelProperList = modelSubscribeMapper.selectModelAndModelGroup(searchCondition); - if (CollectionUtil.isEmpty(modelProperList)){ + List modelGroupList = modelSubscribeMapper.selectModelAndModelGroup(); + List modelList = modelSubscribeMapper.getModelList(searchCondition); + List groupAndChildrenList = setChildren(modelList,modelGroupList , (org, group) -> + org.getModelGroupCode().equals(group.getModelGroupCode()) + ); + if (CollectionUtil.isEmpty(groupAndChildrenList)){ return ResponseVO.error(CodeEnum.NO_DATA); } - List modelGroupList = TreeUtils.build(modelProperList); + List newModelGroupList = TreeUtils.build(groupAndChildrenList); //查询组织机构表 List organList = modelSubscribeMapper.selectOrganData(); //将分类放入各自所属于的组织机构下 + List groupOrgList = setChildren(newModelGroupList, organList,(org, group) -> + org.getCompanyCode().equals(group.getCompanyCode()) + ); + List result = TreeUtils.build(groupOrgList); + return ResponseVO.ok(result); + } + + private List setChildren(List modelGroupList, List organList, BiFunction function) { organList.forEach(org ->{ modelGroupList.forEach(group->{ - if (org.getCompanyCode().equals(group.getCompanyCode())){ + //org.getCompanyCode().equals(group.getCompanyCode() + if (function.apply(org,group)){ if(org.getChildren() == null){ org.setChildren(new LinkedList<>()); } @@ -118,7 +132,6 @@ public class ModelSubscribeServiceImpl implements ModelSubscribeService { } }); }); - List result = TreeUtils.build(organList); - return ResponseVO.ok(result); + return organList; } } 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 ebcdeedabedbe67dc4b1f5d7d65642c34b37f97b..6d969c9c363cf1ca27ecc658c3a249e92a4b7266 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -91,6 +91,9 @@ public class OcpApiTreeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(OcpApiGroup::getApiGroupCode, ocpApiGroup.getApiGroupCode()); + queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode()); String objId = ocpApiGroup.getObjId(); - if (StringUtils.isBlank(ocpApiGroup.getApiGroupCode())) { - flag = false; - } else { - LambdaQueryWrapper eq = queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode()); - if (StringUtils.isBlank(eq.toString())) { - flag = false; - } + List list = mapper.selectGroupPcode(); + if (list.size() >= 1) { + flag = false; } if (flag) { mapper.deleteById(objId); @@ -158,24 +157,33 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getOnePages(PageGroupDto pageGroupDto) { - Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize()); + Page pageInfo = new Page(pageGroupDto.getCurrentPage(), pageGroupDto.getPageSize()); LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); if (StringUtils.isBlank(pageGroupDto.getKeyword())) { - if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){ + if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())) { qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); - mapper.selectPage(pageInfo, qw); + mapper.selectPage(pageInfo, qw); - } else if(!(StringUtils.isNotBlank(pageGroupDto.getApiGroupPcode()))){ + } else if (!(StringUtils.isNotBlank(pageGroupDto.getApiGroupPcode()))) { List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode()); + qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()).and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())); pageInfo.setRecords(ocpApiGroups); - pageInfo.setTotal(ocpApiGroups.size()); + mapper.selectPage(pageInfo, qw); + List records = pageInfo.getRecords(); + for (OcpApiGroup record : records) { + OcpApiGroup ocpApiGroup = mapper.selectCode(record.getApiGroupPcode()); + record.setClassIfy(ocpApiGroup.getApiGroupName()); + } + } - } else if(StringUtils.isNotBlank(pageGroupDto.getKeyword())){ + } else if (StringUtils.isNotBlank(pageGroupDto.getKeyword())) { LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword())) - .and(c->c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())); + .and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())); mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper); } + + return pageInfo; } } diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java index 82864993e6e4e3ef15271b94f5163d5f82fc5514..0553c3c6f36b2689c634c377abb85206f95bd737 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -10,6 +10,7 @@ import com.pms.ocp.mapper.OcpTenantExtentMapper; import com.pms.ocp.mapper.OcpTenantGroupMapper; import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.model.dto.GroupDto; + import com.pms.ocp.model.dto.OcpTenantBaseDto; import com.pms.ocp.model.dto.TenantDto; import com.pms.ocp.model.entity.*; @@ -20,10 +21,13 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -250,10 +254,22 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode) { + public List tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode, String tenantCode) { List ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); + if (ocpTenantGroups.size() != 0) { + return ocpTenantGroups; + } else { + if (StringUtils.isNotEmpty(tenantCode)) { + return Collections.EMPTY_LIST; + } else { + List groupDtos = ocpTenantGroupMapper.selectBase(tenantGroupCode, tenantGroupCompanyCode); + if (groupDtos.size() != 0) { + return groupDtos; + } + return Collections.EMPTY_LIST; + } - return ocpTenantGroups; + } } @@ -310,6 +326,18 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl selectBase(String tenantGroupCode, String tenantGroupCompanyCode) { + List groupDto = ocpTenantGroupMapper.selectBase(tenantGroupCode, tenantGroupCompanyCode); + return groupDto; + } + /** * 应用树2 * 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 68648c2da274a117dad8b0831c723ea73a07bc0b..b3cbf9aeba68632e67fa6a49f2984dd757d021a3 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -173,20 +173,14 @@ public class TenantServiceImpl extends ServiceImpl OcpTenantGroup ocpTenantGroup = tenantMapper.selectGroupCode(tenantGroupCode); Page page = new Page<>(currentPage, pageSize); + if (StringUtils.isBlank(keyword)) { - if ("".equals(lev) || "1".equals(lev)) { + if (StringUtils.isBlank(lev) || "1".equals(lev) ) { LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); tenantMapper.selectPage(page, eq); } else if ("2".equals(lev) || "3".equals(lev)) { - - List ocpTenantGroupList = tenantMapper.selectTenantGroupsList(tenantGroupCode, tenantGroupCompanyCode); - for (OcpTenantGroup tenantGroup : ocpTenantGroupList) { - String tenantGroupCode1 = tenantGroup.getTenantGroupCode(); - OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectGroupName(tenantGroupCode1); - tenantGroup.setClassIfy(ocpTenantGroup1.getTenantGroupName()); - } -// LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); - page.setRecords(ocpTenantGroupList); + LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); + tenantMapper.selectPage(page,eq); } } else if (!(StringUtils.isBlank(keyword))) { LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword)) @@ -201,7 +195,14 @@ public class TenantServiceImpl extends ServiceImpl // page.setRecords(ocpTenantGroupList); // page.setTotal(ocpTenantGroupList.size()); } - + if (StringUtils.isBlank(page.toString())) { + List records = page.getRecords(); + for (OcpTenantGroup record : records) { + String tenantGroupCode1 = record.getTenantGroupName(); + OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectGroupName(tenantGroupCode1); + record.setClassIfy(ocpTenantGroup1.getTenantGroupName()); + } + } return page; diff --git a/src/main/resources/mapper/ModelSubscribeMapper.xml b/src/main/resources/mapper/ModelSubscribeMapper.xml index 8e7c417ce019c24e3a96095342f27a149449b6ac..56daa87dfd0426216469bf6ed92973fd03e87746 100644 --- a/src/main/resources/mapper/ModelSubscribeMapper.xml +++ b/src/main/resources/mapper/ModelSubscribeMapper.xml @@ -1,39 +1,31 @@ - - - - - - - - - - - - - select - 2 AS groupModelBelongLevel, - 3 AS modelLevel, - omg.model_group_pcode, - omg.group_company_code, - omg.model_group_name, - omg.model_group_code, - omb.model_name, - omb.model_code + omg.model_group_name as name, + 2 as belongLevel, + omg.model_group_pcode as pCode, + omg.model_group_code as code, + omg.model_group_code as modelGroupCode, + omg.group_company_code as companyCode from ocp_model_group as omg - left join - ocp_model_base omb - on omg.model_group_code = omb.model_group_code + + + - + + + + + + select obj_id,api_code,api_name,api_group_code from ocp_api_base + + + and api_group_code = #{apiGroupPcode} + + + and owner_company_code =#{apiGroupCompanyCode} + + + and api_promotion=#{apiPromotion} + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml index f634b451a490d31fa5cbaec93380c55bba587896..b4d115ed0e08b66e2d44739837f3047332bf6d2e 100644 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -30,5 +30,9 @@ SELECT * FROM ocp_api_group where api_group_code = #{apiGroupCode}; + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml index 0f6d413ccd11baebe9627bcb89be83e3cdad6c1b..ca9fef4e5fd4c3e1f3d970df93d2f0b2f01e8cde 100644 --- a/src/main/resources/mapper/OcpGroup.xml +++ b/src/main/resources/mapper/OcpGroup.xml @@ -9,7 +9,7 @@ - + @@ -19,8 +19,6 @@ + diff --git a/src/main/resources/mapper/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml index 9aeb10d7cdd53fdfcc9ea2a7b5b64e28bc5f3b40..1b48a758964f65e1fc74aa4a1f93bce94828d8af 100644 --- a/src/main/resources/mapper/OcpTenantGroup.xml +++ b/src/main/resources/mapper/OcpTenantGroup.xml @@ -25,7 +25,7 @@