From 0820424b344bc0d675b3f3d4946befaaf2f773e8 Mon Sep 17 00:00:00 2001 From: diaoruifeng <18351522362@163.com> Date: Sat, 12 Mar 2022 10:54:47 +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 | 5 +++-- .../com/pms/ocp/mapper/OcpApiGroupMapper.java | 2 +- .../java/com/pms/ocp/model/dto/ApiBaseDto.java | 6 +++--- .../ocp/service/ApiBasicManagementService.java | 2 +- .../impl/ApiBasicManagementServiceImpl.java | 16 ++++++++-------- src/main/resources/mapper/OcpApiGroupMapper.xml | 14 ++++++++++---- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 94789f6..5482219 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -19,6 +19,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.omg.PortableInterceptor.Interceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -201,8 +202,8 @@ public class ApiBasicManagementController { @ApiOperation("服务树层级") @GetMapping("/apiBaseTreeOther") - public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode,String apiGroupPcode) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode); + public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType) { + List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode,apiGroupPromotionType); return ResponseVO.ok(apiTreeGroupDtos); } @ApiOperation("服务列表树最低级") diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java index 217f961..aba4230 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiGroupMapper.java @@ -12,7 +12,7 @@ public interface OcpApiGroupMapper extends BaseMapper { List selectTreeList(String apiGroupCompanyCode); - List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode); + List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType); List selectByPcode(String code); 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 dc55cc9..a26de17 100644 --- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java @@ -27,7 +27,7 @@ public class ApiBaseDto implements Serializable { private String apiGroupCompanyCode; @ApiModelProperty("推广类型0:统建；1:自建") - private String apiPromotion; + private Integer apiPromotion; @ApiModelProperty("注册时段-开始") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -54,11 +54,11 @@ public class ApiBaseDto implements Serializable { @ApiModelProperty("每页条数") private Integer pageSize; - public String getApiPromotion() { + public Integer getApiPromotion() { return apiPromotion; } - public void setApiPromotion(String apiPromotion) { + public void setApiPromotion(Integer apiPromotion) { this.apiPromotion = apiPromotion; } diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index 058d4aa..52b6366 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -71,7 +71,7 @@ public interface ApiBasicManagementService extends IService { * @param apiGroupPcode * @return */ - List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode); + List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType); /** * 根据分组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 17ee59b..cbfb3e2 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -181,8 +181,8 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode) { - List ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode); + public List apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode,Integer apiGroupPromotionType) { + List ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode,apiGroupPromotionType); return ocpApiGroups; } @@ -194,7 +194,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl codes = getIdsByPIdPub(apiGroupCompanyCode,code); + private void setGroupIdValue(String apiGroupCompanyCode ,String code,Integer apiGroupPromotionType) { + List codes = getIdsByPIdPub(apiGroupCompanyCode,code,apiGroupPromotionType); if(codes.size()>0){ for (String cod : codes ){ - setGroupIdValue(apiGroupCompanyCode,cod); + setGroupIdValue(apiGroupCompanyCode,cod,apiGroupPromotionType); apiGroupCode.add(cod); }; } @@ -260,8 +260,8 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl getIdsByPIdPub(String apiGroupCompanyCode,String code) { - List ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode, code); + public List getIdsByPIdPub(String apiGroupCompanyCode,String code,Integer apiGroupPromotionType) { + List ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode, code,apiGroupPromotionType); return ocpApiGroups.stream().map(OcpApiGroup::getApiGroupCode).collect(Collectors.toList()); } diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml index 28b72d6..bd55a8c 100644 --- a/src/main/resources/mapper/OcpApiGroupMapper.xml +++ b/src/main/resources/mapper/OcpApiGroupMapper.xml @@ -33,14 +33,20 @@