赵呈明 --应用服务树分类

src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java

@@ -32,7 +32,7 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
     List<OcpApiGroup> selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode);
 
 
-  List<OcpApiGroup> selectLists(Long apiGroupPromotionType, String apiGroupCode,Long apiGroupLevel);
+  List<OcpApiGroup> selectLists(Long apiGroupPromotionType, String apiGroupCode,String apiGroupLevel);
 
 //code重复问题
   List<OcpApiGroup> selectGroupCode();

src/main/java/com/pms/ocp/model/dto/PageGroupDto.java

@@ -51,7 +51,7 @@ public class PageGroupDto extends PageParam {
     private long isDelete;
 
     @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
-    private long apiGroupLevel;
+    private String apiGroupLevel;
 
     public String getObjId() {
         return objId;
@@ -157,11 +157,11 @@ public class PageGroupDto extends PageParam {
         this.isDelete = isDelete;
     }
 
-    public long getApiGroupLevel() {
+    public String getApiGroupLevel() {
         return apiGroupLevel;
     }
 
-    public void setApiGroupLevel(long apiGroupLevel) {
+    public void setApiGroupLevel(String apiGroupLevel) {
         this.apiGroupLevel = apiGroupLevel;
     }
 }

src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.github.pagehelper.PageInfo;
 import com.pms.ocp.common.utils.RandomStringUtils;
 import com.pms.ocp.mapper.OcpApiBaseMapper;
 import com.pms.ocp.mapper.OcpApiTreeMapper;
@@ -146,18 +147,18 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
     @Override
     public Page<OcpApiGroup> getOnePages(PageGroupDto pageGroupDto) {
 
-        Page pageInfo = new Page(pageGroupDto.getPageSize(), pageGroupDto.getPageNum());
+        Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize());
         if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){
-            List<OcpApiGroup> ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType());
-            pageInfo.setRecords(ocpApiGroups);
+//            List<OcpApiGroup> ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType());
+//            pageInfo.setRecords(ocpApiGroups);
             LambdaQueryWrapper<OcpApiGroup> lambdaQueryWrapper = new LambdaQueryWrapper();
-            lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType());
-            mapper.selectPage(pageInfo,lambdaQueryWrapper);
+             lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType());
+           pageInfo =  mapper.selectPage(pageInfo,lambdaQueryWrapper);
         }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){
             List<OcpApiGroup> ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel());
-            LambdaQueryWrapper<OcpApiGroup> lwq = new LambdaQueryWrapper<>();
+//            LambdaQueryWrapper<OcpApiGroup> lwq = new LambdaQueryWrapper<>();
             pageInfo.setRecords(ocpApiGroups);
-            mapper.selectPage(pageInfo, lwq);
+            pageInfo =  mapper.selectPage(pageInfo, null);
         }
         return pageInfo;
     }

src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java

@@ -176,10 +176,10 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
         Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize);
         if (StringUtils.isBlank(keyword)) {
          if(lev.equals("1")) {
-              List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode);
-              qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
-              page.setRecords(ocpTenantGroupList);
-              tenantMapper.selectPage(page, qw);
+             // List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode);
+             LambdaQueryWrapper<OcpTenantGroup> eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
+//             page.setRecords(ocpTenantGroupList);
+              tenantMapper.selectPage(page, eq);
          }else if (lev.equals("2") || lev.equals("3")) {
                 LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
                 tenantMapper.selectPage(page, eq);

src/main/resources/mapper/OcpApiTreeMapper.xml

@@ -15,7 +15,7 @@
     </select>
 <!--服务树 -查询-->
     <select id="selectLists" resultType="com.pms.ocp.model.entity.OcpApiGroup">
- SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = #{apiGroupCode} and api_group_level == #{apiGroupLevel + 0};
+ SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = #{apiGroupCode} and api_group_level = #{apiGroupLevel};
     </select>