From fc8a4cfc54c3d00520b0cef48f2877e9e40a1be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= Date: Tue, 29 Mar 2022 12:26:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiBasicManagementController.java | 4 +- .../ocp/mapper/ApiBasicManagementMapper.java | 3 +- .../com/pms/ocp/model/dto/ApiBaseDto.java | 3 + .../service/ApiBasicManagementService.java | 8 +-- .../impl/ApiBasicManagementServiceImpl.java | 28 +++++---- .../mapper/ApiBasicManagementMapper.xml | 57 ++++++++++++------- 6 files changed, 64 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index a69f9ce..3887000 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -209,8 +209,8 @@ public class ApiBasicManagementController { @ApiOperation("省侧-应用接入申请-的模糊查询") @GetMapping("/selectByCondition") - public ResponseVO> selectByCondition(ApiBaseDto ApiBaseReq) { - return apiBasicManagementService.getBaseByGroupCode(ApiBaseReq); + public ResponseVO> selectByCondition(ApiBaseDto apiBaseReq) { + return apiBasicManagementService.selectByCondition(apiBaseReq); } diff --git a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java index 9fb6fa9..a58c39a 100644 --- a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java @@ -1,6 +1,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.OcpApiBaseDto; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.vo.OcpApiBaseVo; @@ -18,5 +19,5 @@ public interface ApiBasicManagementMapper extends BaseMapper { - List selectByCondition(@Param("apiCode") String apiCode, @Param("apiName") String apiName, @Param("apiCenterCode") String apiCenterCode,@Param("apiGroupCode") String apiGroupCode); + List selectByCondition(ApiBaseDto apiBaseReq); } diff --git a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java index 66f1f9b..2adee52 100644 --- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java @@ -57,6 +57,9 @@ public class ApiBaseDto implements Serializable { @ApiModelProperty("当前页") private Integer pageNum; + //不同接口区分 + @ApiModelProperty("当前页2") + private Integer currentPage; @ApiModelProperty("每页条数") private Integer pageSize; diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index fd3716a..a43c610 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -83,15 +83,9 @@ public interface ApiBasicManagementService extends IService { /** * 省侧-应用接入申请-的模糊查询 - * @param apiCode - * @param apiName - * @param apiCenterCode - * @param currentPage - * @param pageSize - * @param apiGroupCode * @return */ - ResponseVO> selectByCondition(String apiCode, String apiName, String apiCenterCode,Integer currentPage,Integer pageSize,String apiGroupCode); + ResponseVO> selectByCondition(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 2edd4da..cecb8b5 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -258,23 +258,31 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl> selectByCondition(String apiCode, String apiName,String apiCenterCode ,Integer currentPage, Integer pageSize, String apiGroupCode) { - if (currentPage == null || pageSize == null) { + public ResponseVO> selectByCondition(ApiBaseDto apiBaseReq) { + if (apiBaseReq.getCurrentPage() == null || apiBaseReq.getPageSize() == null) { return ResponseVO.error("分页参数不能为空"); } - PageHelper.startPage(currentPage, pageSize); - List list = apiBasicManagementMapper.selectByCondition(apiCode, apiName, apiCenterCode,apiGroupCode); + apiGroupCode.add(apiBaseReq.getApiGroupCode()); + setGroupIdValue(apiBaseReq.getApiGroupCompanyCode(), apiBaseReq.getApiGroupCode(), apiBaseReq.getApiPromotion()); + PageHelper.startPage(apiBaseReq.getCurrentPage(), apiBaseReq.getPageSize()); + apiBaseReq.setApiGroupCodeList(apiGroupCode); +// List ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq); + List list = apiBasicManagementMapper.selectByCondition(apiBaseReq); + apiGroupCode.clear(); PageInfo pageInfo = new PageInfo<>(list); return ResponseVO.ok(pageInfo); + +// +// if (currentPage == null || pageSize == null) { +// return ResponseVO.error("分页参数不能为空"); +// } +// PageHelper.startPage(currentPage, pageSize); +// List list = apiBasicManagementMapper.selectByCondition(apiCode, apiName, apiCenterCode,apiGroupCode); +// PageInfo pageInfo = new PageInfo<>(list); +// return ResponseVO.ok(pageInfo); } /** diff --git a/src/main/resources/mapper/ApiBasicManagementMapper.xml b/src/main/resources/mapper/ApiBasicManagementMapper.xml index 341d98a..34e565e 100644 --- a/src/main/resources/mapper/ApiBasicManagementMapper.xml +++ b/src/main/resources/mapper/ApiBasicManagementMapper.xml @@ -27,7 +27,44 @@ - + + @@ -70,23 +107,5 @@ - \ No newline at end of file -- 2.26.0