From 843352e15852be0527e18a4c9a9149a45190db82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= Date: Mon, 28 Mar 2022 11:59:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=B8=AD=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=B8=AD=E5=BF=83-=E4=B8=8B=E6=8B=89=E6=A1=86=20?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiBasicManagementController.java | 27 +++++----- .../ocp/mapper/ApiBasicManagementMapper.java | 2 +- .../pms/ocp/mapper/OcpTenantGroupMapper.java | 3 ++ .../service/ApiBasicManagementService.java | 13 ++++- .../impl/ApiBasicManagementServiceImpl.java | 53 +++++++++++++------ .../mapper/ApiBasicManagementMapper.xml | 3 ++ src/main/resources/mapper/OcpGroup.xml | 3 ++ 7 files changed, 73 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 05f049d..655c868 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -8,6 +8,7 @@ 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.entity.OcpTenantGroup; import com.pms.ocp.model.vo.OcpApiBaseVo; import com.pms.ocp.model.vo.ResponseVO; @@ -43,8 +44,6 @@ public class ApiBasicManagementController { @Autowired private ApiBasicManagementService apiBasicManagementService; - - @ApiOperation("导入功能") @PostMapping("/import") public ResponseVO ApiImport(@RequestParam(required = false) MultipartFile file, @@ -136,7 +135,6 @@ public class ApiBasicManagementController { // } //} - @ApiOperation("下载模块") @GetMapping("/downloadExcel") public void downloadExcel(HttpServletResponse response, HttpServletRequest request) { @@ -197,8 +195,8 @@ public class ApiBasicManagementController { @ApiOperation("服务分类层级") @GetMapping("/apiBaseTreeOther") - public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType,String apiCode) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType,apiCode); + public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType, String apiCode) { + List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType, apiCode); return ResponseVO.ok(apiTreeGroupDtos); } @@ -211,15 +209,20 @@ public class ApiBasicManagementController { @ApiOperation("省侧-应用接入申请-的模糊查询") @GetMapping("/selectByCondition") - public ResponseVO >selectByCondition(@RequestParam(required = false) String apiCode, - @RequestParam(required = false) String apiName, - @RequestParam(required = false) String apiCenterCode, - @RequestParam(required = false) Integer pageNum, - @RequestParam(required = false) Integer pageSize){ - return apiBasicManagementService.selectByCondition(apiCode,apiName,apiCenterCode,pageNum,pageSize); + public ResponseVO> selectByCondition(@RequestParam(required = false) String apiCode, + @RequestParam(required = false) String apiName, + @RequestParam(required = false) String apiCenterCode, + @RequestParam(required = false) Integer pageNum, + @RequestParam(required = false) Integer pageSize, + @RequestParam(required = false) String apiGroupCode) { + return apiBasicManagementService.selectByCondition(apiCode, apiName, apiCenterCode, pageNum, pageSize, apiGroupCode); } - + @ApiOperation("省侧-应用接入申请-查询组中所有中心") + @GetMapping("/selectCentre") + public ResponseVO> selectCentre() { + return apiBasicManagementService.selectCentre(); + } } diff --git a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java index 0b221c6..9fb6fa9 100644 --- a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java @@ -18,5 +18,5 @@ public interface ApiBasicManagementMapper extends BaseMapper { - List selectByCondition(@Param("apiCode") String apiCode, @Param("apiName") String apiName, @Param("apiCenterCode") String apiCenterCode); + List selectByCondition(@Param("apiCode") String apiCode, @Param("apiName") String apiName, @Param("apiCenterCode") String apiCenterCode,@Param("apiGroupCode") String apiGroupCode); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java index d9d6ba7..b4494cc 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java @@ -6,6 +6,7 @@ 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.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantGroup; import org.apache.ibatis.annotations.Mapper; @@ -22,4 +23,6 @@ public interface OcpTenantGroupMapper extends BaseMapper { List selectBase(@Param("tenantGroupCode") String tenantGroupCode, String tenantGroupCompanyCode); + + List selectCentre(); } diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index c7424a7..d1747ec 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -7,6 +7,7 @@ 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; +import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.vo.OcpApiBaseVo; import com.pms.ocp.model.vo.ResponseVO; @@ -80,15 +81,23 @@ public interface ApiBasicManagementService extends IService { */ List apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode); - /** * 省侧-应用接入申请-的模糊查询 * @param apiCode * @param apiName * @param apiCenterCode + * @param pageNum + * @param pageSize + * @param apiGroupCode + * @return + */ + ResponseVO> selectByCondition(String apiCode, String apiName, String apiCenterCode,Integer pageNum,Integer pageSize,String apiGroupCode); + + /** + * 省侧-应用接入申请-查询组中所有中心 * @return */ - ResponseVO> selectByCondition(String apiCode, String apiName, String apiCenterCode,Integer pageNum,Integer pageSize); + ResponseVO> selectCentre(); // /** // * 服务列表2 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 0ab9834..902983d 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -7,24 +7,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -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.mapper.*; 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.OcpApiExtent; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.entity.OcpApiSubs; +import com.pms.ocp.model.entity.*; import com.pms.ocp.model.vo.*; import com.pms.ocp.service.ApiBasicManagementService; import com.pms.ocp.service.OcpApiExtentService; +import com.pms.ocp.service.OcpTenantGroupService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,7 +47,10 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl apiGroupCode = new ArrayList<>(); /** @@ -97,8 +95,6 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl> selectByCondition(String apiCode, String apiName, String apiCenterCode, Integer pageNum, Integer pageSize) { + + public ResponseVO> selectByCondition(String apiCode, String apiName,String apiCenterCode ,Integer pageNum, Integer pageSize, String apiGroupCode) { if (pageNum == null || pageSize == null) { return ResponseVO.error("分页参数不能为空"); } PageHelper.startPage(pageNum, pageSize); - List list = apiBasicManagementMapper.selectByCondition(apiCode, apiName, apiCenterCode); + List list = apiBasicManagementMapper.selectByCondition(apiCode, apiName, apiCenterCode,apiGroupCode); PageInfo pageInfo = new PageInfo<>(list); return ResponseVO.ok(pageInfo); } + + /** + * 省侧-应用接入申请-查询组中所有中心 + * + * @return + */ + @Override + public ResponseVO> selectCentre() { +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// lambdaQueryWrapper.eq(OcpTenantGroup::getLevel, "sys_center"); +// List ocpTenantGroups = ocpTenantGroupMapper.selectList(lambdaQueryWrapper); +// return ResponseVO.ok(ocpTenantGroups); + List ocpApiGroups = ocpTenantGroupMapper.selectCentre(); + ArrayList objects = new ArrayList<>(); + for (OcpApiGroup ocpApiGroup : ocpApiGroups) { + if (ocpApiGroup.getApiGroupLevel().equals("sys_center")) { + objects.add(ocpApiGroup); + } + } + return ResponseVO.ok(objects); + } } diff --git a/src/main/resources/mapper/ApiBasicManagementMapper.xml b/src/main/resources/mapper/ApiBasicManagementMapper.xml index c226eb4..341d98a 100644 --- a/src/main/resources/mapper/ApiBasicManagementMapper.xml +++ b/src/main/resources/mapper/ApiBasicManagementMapper.xml @@ -82,6 +82,9 @@ and api_center_code=#{apiCenterCode} + + and api_group_code=#{apiGroupCode} + diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml index d75ebf6..9a1cb1d 100644 --- a/src/main/resources/mapper/OcpGroup.xml +++ b/src/main/resources/mapper/OcpGroup.xml @@ -80,5 +80,8 @@ + -- 2.26.0