服务列表树功能优化

src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java

 package com.pms.ocp.controller;
 
+import com.github.pagehelper.PageInfo;
 import com.pms.ocp.common.utils.ExcelUtils;
 import com.pms.ocp.common.utils.FileExport;
 import com.pms.ocp.common.utils.FileUtil;
@@ -189,9 +190,9 @@ public class ApiBasicManagementController {
 
     @ApiOperation("服务列表")
     @GetMapping("/apiListQuery")
-    public QueryResponseResult apiListQuery(HttpServletRequest request, ApiBaseDto ApiBaseReq) {
-            QueryResponseResult apiBaseList=  apiBasicManagementService.getBaseByGroupCode(ApiBaseReq);
-      return apiBaseList;
+    public ResponseVO<PageInfo<OcpApiBaseVo>> apiListQuery(HttpServletRequest request, ApiBaseDto ApiBaseReq) {
+
+      return  apiBasicManagementService.getBaseByGroupCode(ApiBaseReq);
     }
     //@ApiOperation("服务树一级")
     //@GetMapping("/apiBaseTree")

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

 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.dto.ApiBaseDto;
 import com.pms.ocp.model.entity.OcpApiBase;
 import com.pms.ocp.model.entity.OcpApiGroup;
+import com.pms.ocp.model.vo.OcpApiBaseVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -16,4 +18,5 @@ public interface OcpApiGroupMapper extends BaseMapper<OcpApiGroup> {
 
     List<OcpApiBase> selectByPcode(String code);
 
+    List<OcpApiBaseVo> selectPageLists(ApiBaseDto apiBaseReq);
 }

src/main/java/com/pms/ocp/service/ApiBasicManagementService.java

 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;
@@ -78,7 +79,7 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
      * @param ApiBaseReq
      * @return
      */
-    QueryResponseResult getBaseByGroupCode(ApiBaseDto ApiBaseReq);
+    ResponseVO<PageInfo<OcpApiBaseVo>> getBaseByGroupCode(ApiBaseDto ApiBaseReq);
 
     /**
      *   服务分类暴露服务列表

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

@@ -6,6 +6,8 @@ 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.mapper.ApiBasicManagementMapper;
@@ -21,6 +23,7 @@ import com.pms.ocp.model.entity.OcpApiExtent;
 import com.pms.ocp.model.entity.OcpApiGroup;
 import com.pms.ocp.model.entity.OcpApiSubs;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
+import com.pms.ocp.model.vo.OcpModelGroupVO;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.ApiBasicManagementService;
 import com.pms.ocp.service.OcpApiExtentService;
@@ -187,42 +190,17 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
     }
 
     @Override
-    public QueryResponseResult getBaseByGroupCode(ApiBaseDto apiBaseReq) {
-        QueryResponseResult queryResponseResult = new QueryResponseResult(CommonCode.SUCCESS, null);
+    public ResponseVO<PageInfo<OcpApiBaseVo>> getBaseByGroupCode(ApiBaseDto apiBaseReq) {
         if (apiBaseReq.getPageNum() == null || apiBaseReq.getPageSize() == null) {
-            queryResponseResult.setMessage("分页参数不能为空");
-            return queryResponseResult;
+            ResponseVO.error("分页参数不能为空");
         }
         apiGroupCode.add(apiBaseReq.getApiGroupCode());
         setGroupIdValue(apiBaseReq.getApiGroupCompanyCode() ,apiBaseReq.getApiGroupCode(),apiBaseReq.getApiPromotion());
-        QueryWrapper qw = new QueryWrapper();
-        if (!StringUtils.isEmpty(apiBaseReq.getKeyword())) {
-            qw.like("api_name", apiBaseReq.getKeyword());
-        }
-        if (!StringUtils.isEmpty(apiBaseReq.getApiGroupCode())) {
-            qw.in("api_group_code", apiGroupCode.stream().collect(Collectors.toList()));
-        }
-        if (!StringUtils.isEmpty(apiBaseReq.getApiGroupCompanyCode())) {
-            qw.eq("api_unit", apiBaseReq.getApiGroupCompanyCode());
-        }
-        if (!StringUtils.isEmpty(apiBaseReq.getApiPromotion())) {
-            qw.eq("api_promotion", apiBaseReq.getApiPromotion());
-        }
-        if (!StringUtils.isEmpty(apiBaseReq.getStartCTime())) {
-            qw.ge("api_ctime", apiBaseReq.getApiGroupCompanyCode());
-        }
-        if (!StringUtils.isEmpty(apiBaseReq.getStartCTime())) {
-            qw.le("api_ctime", apiBaseReq.getApiGroupCompanyCode());
-        }
-        IPage iPage = new Page(apiBaseReq.getPageNum(), apiBaseReq.getPageSize());
-        apiBasicManagementMapper.selectPage(iPage,qw);
+        PageHelper.startPage(apiBaseReq.getPageNum(),apiBaseReq.getPageSize());
+        List<OcpApiBaseVo> ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq);
         apiGroupCode.clear();
-        if (iPage.getTotal() == 0) {
-            queryResponseResult.setData(iPage);
-            return queryResponseResult;
-        }
-        queryResponseResult.setData(iPage);
-        return queryResponseResult;
+        PageInfo<OcpApiBaseVo> pageInfo = new PageInfo<>(ocpApiBaseVos);
+        return ResponseVO.ok(pageInfo);
     }
 
     @Override

src/main/resources/mapper/OcpApiGroupMapper.xml

@@ -48,12 +48,35 @@
             and api_group_promotion_type =#{apiGroupPromotionType}
         </if>
     </select>
-    <select id="selectByPcode" resultType="com.pms.ocp.model.entity.OcpApiGroup">
-        select  api_group_code,api_group_name from ocp_api_group where 1 = 1
-        <if test="apiGroupCompanyCode!=null and apiGroupCompanyCode!=''">
-            and api_group_company_code =#{apiGroupCompanyCode}
+    <select id="selectPageLists" resultType="com.pms.ocp.model.vo.OcpApiBaseVo">
+        select
+        oab.obj_id,oab.api_code,oae.api_code,oab.api_name,oae.cluster_name,
+        oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime from ocp_api_base oab
+        LEFT JOIN ocp_api_extent oae
+        on oab.api_code = oae.api_code
+        where oab.is_delete = 0
+        <if test="apiGroupCode !=null and apiGroupCode!=''">
+            and  oab.api_group_code = #{apiGroupCode}
+        </if>
+        <if test="apiGroupCompanyCode !=null and apiGroupCompanyCode!=''">
+            and  oab.api_unit = #{apiGroupCompanyCode}
+        </if>
+        <if test="apiPromotion !=null and apiPromotion!=''">
+            and  oab.api_promotion = #{apiPromotion}
+        </if>
+        <if test="startTime !=null  ">
+            <![CDATA[
+                and oab.api_ctime >= #{startCTime}
+                ]]>
+        </if>
+        <if test="endTime !=null  ">
+            <![CDATA[
+            and oab.api_ctime <= #{endCTime}
+            ]]>
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and oab.api_name like CONCAT('%', #{keyword}::text,'%')
         </if>
-
     </select>
 
 </mapper>
\ No newline at end of file