From 582cba34ae795e45319e7b33b80411f2dbe47fd3 Mon Sep 17 00:00:00 2001 From: diaoruifeng <18351522362@163.com> Date: Mon, 14 Mar 2022 15:03:12 +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 --- .../controller/ApiBasicManagementController.java | 12 +++++++++--- .../pms/ocp/controller/ApiDetailsController.java | 4 ++-- .../java/com/pms/ocp/mapper/ApiDetailsMapper.java | 3 +-- .../com/pms/ocp/service/ApiDetailsService.java | 4 ++-- .../impl/ApiBasicManagementServiceImpl.java | 2 +- .../ocp/service/impl/ApiDetailsServiceImpl.java | 4 ++-- src/main/resources/mapper/ApiDetailsMapper.xml | 14 ++++++++++++-- 7 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 986cb71..6a11939 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -194,18 +194,24 @@ public class ApiBasicManagementController { return apiBasicManagementService.getBaseByGroupCode(ApiBaseReq); } - @ApiOperation("服务树一级") + /* @ApiOperation("服务树一级") @GetMapping("/apiBaseTree") public ResponseVO> apiBaseTree(String apiGroupCompanyCode, Integer apiGroupPromotionType) { List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,null,apiGroupPromotionType); return ResponseVO.ok(apiTreeGroupDtos); - } + }*/ - @ApiOperation("服务树层级") + @ApiOperation("服务分类层级") @GetMapping("/apiBaseTreeOther") public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType) { List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupCode,apiGroupPromotionType); return ResponseVO.ok(apiTreeGroupDtos); } + @ApiOperation("服务树列表") + @GetMapping("/apiBaseTreeList") + public ResponseVO> apiBaseTreeList(String apiGroupCompanyCode, String apiGroupCode) { + List apiBaseList = apiBasicManagementService.apiBaseTreeApiList(apiGroupCompanyCode, apiGroupCode); + return ResponseVO.ok(apiBaseList); + } } diff --git a/src/main/java/com/pms/ocp/controller/ApiDetailsController.java b/src/main/java/com/pms/ocp/controller/ApiDetailsController.java index 927cfe4..3bc5b21 100644 --- a/src/main/java/com/pms/ocp/controller/ApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/ApiDetailsController.java @@ -24,8 +24,8 @@ public class ApiDetailsController { @ApiOperation("服务库服务详情-查询") @GetMapping("/query") - public ResponseVO getApiDetails(String objId) { - return apiDetailsService.getApiDetails(objId); + public ResponseVO getApiDetails(String code) { + return apiDetailsService.getApiDetails(code); } } diff --git a/src/main/java/com/pms/ocp/mapper/ApiDetailsMapper.java b/src/main/java/com/pms/ocp/mapper/ApiDetailsMapper.java index bd94f41..1f3efbc 100644 --- a/src/main/java/com/pms/ocp/mapper/ApiDetailsMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ApiDetailsMapper.java @@ -11,6 +11,5 @@ import java.util.List; @Mapper public interface ApiDetailsMapper extends BaseMapper { - - + OcpApiBaseVo selectByCode(String code); } diff --git a/src/main/java/com/pms/ocp/service/ApiDetailsService.java b/src/main/java/com/pms/ocp/service/ApiDetailsService.java index fb31a5b..5ee8ca1 100644 --- a/src/main/java/com/pms/ocp/service/ApiDetailsService.java +++ b/src/main/java/com/pms/ocp/service/ApiDetailsService.java @@ -12,10 +12,10 @@ import java.util.List; public interface ApiDetailsService{ /** * - * @param objId + * @param code * @return */ - ResponseVO getApiDetails(String objId); + ResponseVO getApiDetails(String code); } 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 baa197e..753effd 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -192,7 +192,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl> getBaseByGroupCode(ApiBaseDto apiBaseReq) { if (apiBaseReq.getPageNum() == null || apiBaseReq.getPageSize() == null) { - ResponseVO.error("分页参数不能为空"); + return ResponseVO.error("分页参数不能为空"); } apiGroupCode.add(apiBaseReq.getApiGroupCode()); setGroupIdValue(apiBaseReq.getApiGroupCompanyCode() ,apiBaseReq.getApiGroupCode(),apiBaseReq.getApiPromotion()); diff --git a/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java index 8ce618a..7b1091c 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java @@ -38,8 +38,8 @@ public class ApiDetailsServiceImpl implements ApiDetailsService { @Override - public ResponseVO getApiDetails(String objId) { - OcpApiBase ocpApiBase = apiDetailsMapper.selectById(objId); + public ResponseVO getApiDetails(String code) { + OcpApiBaseVo ocpApiBase = apiDetailsMapper.selectByCode(code); return ResponseVO.ok(ocpApiBase); } diff --git a/src/main/resources/mapper/ApiDetailsMapper.xml b/src/main/resources/mapper/ApiDetailsMapper.xml index af871c8..9b306bb 100644 --- a/src/main/resources/mapper/ApiDetailsMapper.xml +++ b/src/main/resources/mapper/ApiDetailsMapper.xml @@ -2,6 +2,16 @@ + + -- 2.26.0