From 230a60dd812f38f8c0b46543a4f84849d5a222ca Mon Sep 17 00:00:00 2001 From: itcast Date: Sat, 12 Mar 2022 13:24:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=BA=93=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TenantBasicManagementController.java | 24 ++++++++++++------- .../pms/ocp/mapper/OcpTenantGroupMapper.java | 4 ++++ .../service/TenantBasicManagementService.java | 10 ++++++++ .../TenantBasicManagementServiceImpl.java | 16 +++++++++++++ src/main/resources/mapper/OcpGroup.xml | 19 +++++++++++++++ 5 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/mapper/OcpGroup.xml diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index 028c4d1..1aa7a7b 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -3,6 +3,8 @@ package com.pms.ocp.controller; import com.pms.ocp.model.dto.OcpApiBaseDto; import com.pms.ocp.model.dto.OcpTenantBaseDto; import com.pms.ocp.model.dto.OcpTenantGroupDto; +import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.TenantBasicManagementService; import com.pms.ocp.service.TenantService; @@ -47,23 +49,23 @@ public class TenantBasicManagementController { @PostMapping("/issue") public ResponseVO TenantIssue(@RequestParam(required = false) String tenantPromotion, @RequestParam(required = false) String tenantCodes) { - if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) { - return ResponseVO.error("统招"); - } else { +// if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) { +// return ResponseVO.error("统招"); +// } else { return tenantBasicManagementService.tenantIssue(tenantCodes); - } +// } } @ApiOperation("应用订阅") @PostMapping("/login") public ResponseVO TenantLogin(@RequestParam(required = false) String tenantPromotion, @RequestParam(required = false) String tenantCodes) { - if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) { - return ResponseVO.error("统招"); - } else { +// if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) { +// return ResponseVO.error("统招"); +// } else { tenantBasicManagementService.tenantLogin(tenantCodes); return ResponseVO.ok(); - } +// } } @@ -81,6 +83,12 @@ public class TenantBasicManagementController { return tenantBasicManagementService.applyRegister(ocpTenantBaseDto); } + @ApiOperation("应用树层级") + @GetMapping("/apiBaseTreeOther") + public ResponseVO> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode) { + List ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupPcode); + return ResponseVO.ok(ocpApiGroups); + } } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java index 31992e0..3a6586b 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java @@ -4,7 +4,11 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pms.ocp.model.entity.OcpTenantGroup; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; @Mapper public interface OcpTenantGroupMapper extends BaseMapper { + List tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupPcode") String tenantGroupPcode); } diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index 252e516..e9d5d7b 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -2,7 +2,9 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.pms.ocp.model.dto.OcpTenantBaseDto; +import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.vo.ResponseVO; import java.sql.Timestamp; @@ -46,4 +48,12 @@ public interface TenantBasicManagementService extends IService { * @param ocpTenantBaseDto */ ResponseVO applyRegister(OcpTenantBaseDto ocpTenantBaseDto); + + /** + * 应用树层级 + * @param tenantGroupCode + * @param tenantGroupPcode + * @return + */ + List tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode); } diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java index 5c53ff6..b97ff24 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.mapper.OcpTenantExtentMapper; +import com.pms.ocp.mapper.OcpTenantGroupMapper; import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.model.dto.OcpApiBaseDto; import com.pms.ocp.model.dto.OcpTenantBaseDto; @@ -33,6 +34,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode) { + List ocpTenantGroups=ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode,tenantGroupPcode); + return ocpTenantGroups; + } + } diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml new file mode 100644 index 0000000..e713c1d --- /dev/null +++ b/src/main/resources/mapper/OcpGroup.xml @@ -0,0 +1,19 @@ + + + + + + + -- 2.26.0