From ed05462a25e9e5562d74ea7499b26b9c9d9eccdc Mon Sep 17 00:00:00 2001 From: diaoruifeng <18351522362@163.com> Date: Sat, 12 Mar 2022 13:22:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8=E6=A0=91?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiBasicManagementController.java | 7 ++-- .../com/pms/ocp/mapper/OcpApiGroupMapper.java | 3 ++ .../service/ApiBasicManagementService.java | 3 +- .../impl/ApiBasicManagementServiceImpl.java | 40 +++++-------------- .../resources/mapper/OcpApiGroupMapper.xml | 33 ++++++++++++--- 5 files changed, 46 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 3b307ab..b4adf8d 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -1,5 +1,6 @@ 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> apiListQuery(HttpServletRequest request, ApiBaseDto ApiBaseReq) { + + return apiBasicManagementService.getBaseByGroupCode(ApiBaseReq); } //@ApiOperation("服务树一级") //@GetMapping("/apiBaseTree") diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java index aba4230..5225c4d 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java @@ -1,8 +1,10 @@ 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 { List selectByPcode(String code); + List selectPageLists(ApiBaseDto apiBaseReq); } diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index 52b6366..8112c2e 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -1,6 +1,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; @@ -78,7 +79,7 @@ public interface ApiBasicManagementService extends IService { * @param ApiBaseReq * @return */ - QueryResponseResult getBaseByGroupCode(ApiBaseDto ApiBaseReq); + ResponseVO> getBaseByGroupCode(ApiBaseDto ApiBaseReq); /** * 服务分类暴露服务列表 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 cbfb3e2..2e0643c 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/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> 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 ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq); apiGroupCode.clear(); - if (iPage.getTotal() == 0) { - queryResponseResult.setData(iPage); - return queryResponseResult; - } - queryResponseResult.setData(iPage); - return queryResponseResult; + PageInfo pageInfo = new PageInfo<>(ocpApiBaseVos); + return ResponseVO.ok(pageInfo); } @Override diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml index 4d3999d..0b43e7f 100644 --- a/src/main/resources/mapper/OcpApiGroupMapper.xml +++ b/src/main/resources/mapper/OcpApiGroupMapper.xml @@ -48,12 +48,35 @@ and api_group_promotion_type =#{apiGroupPromotionType} - + 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 + + and oab.api_group_code = #{apiGroupCode} + + + and oab.api_unit = #{apiGroupCompanyCode} + + + and oab.api_promotion = #{apiPromotion} + + + = #{startCTime} + ]]> + + + + + + and oab.api_name like CONCAT('%', #{keyword}::text,'%') - \ No newline at end of file -- 2.26.0