diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index bbe8ccf595dc0745e3776dc35b9507f6c24334d2..1a0fe9a9a6c764537df56ddb96f153a2b8cc097e 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.github.pagehelper.PageInfo; import com.pms.ocp.model.dto.*; +import com.pms.ocp.model.entity.OcpApiBase; +import com.pms.ocp.model.entity.OcpApiTenantRel; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.vo.ResponseVO; @@ -128,4 +130,9 @@ public class TenantBasicManagementController { public ResponseVO update(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){ return tenantBasicManagementService.updateByCondition(ocpBaseTiocnDto); } + @ApiOperation("个人信息中-查询和应用关联的服务") + @PostMapping("/selectOcpByApi") + public ResponseVO> selectOcpByApi(@RequestParam(required = false) String tenantCode){ + return tenantBasicManagementService.selectOcpByApi(tenantCode); + } } diff --git a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java index 7bc60599fa8fcf18dfc39de24d1cb75bdeaa8509..5983ab95207d1339f9cf4c4304391013bfb621d3 100644 --- a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java +++ b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java @@ -3,8 +3,10 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pms.ocp.model.dto.GroupDto; import com.pms.ocp.model.dto.OcpTenantBaseDto; +import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.vo.CompanyVo; +import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.model.vo.TenantGroupVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index a1cec12573871cee8c44384665f96eb9ef127934..09616c1ec18991f94045b68c7e15acc150c83d82 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -3,9 +3,7 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pms.ocp.model.dto.*; -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.entity.*; import com.pms.ocp.model.vo.OcpApiBaseVo; import com.pms.ocp.model.vo.ResponseVO; @@ -97,6 +95,13 @@ public interface TenantBasicManagementService extends IService { */ ResponseVO updateByCondition(OcpBaseTiocnDto ocpBaseTiocnDto); + /** + * 个人信息中-查询和应用关联的服务 + * @param tenantCode + * @return + */ + ResponseVO >selectOcpByApi(String tenantCode); + /** * 应用树 * @param tenantGroupCode 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 265b8eb2498cbb64363f2ec3c96726f7928436b2..709849815a869be9d0a228f4c7cf244418c65657 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -42,6 +42,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl tenantGroup = new ArrayList<>(); /** @@ -393,6 +397,33 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl> selectOcpByApi(String tenantCode) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(StringUtils.isNotEmpty(tenantCode), OcpApiTenantRel::getTenantCode, tenantCode); + List ocpApiTenantRel = ocpApiTenantRelMapper.selectList(lambdaQueryWrapper); + + if (ocpApiTenantRel.size() == 0) { + return ResponseVO.ok(Collections.EMPTY_LIST); + } else { + for (OcpApiTenantRel apiTenantRel : ocpApiTenantRel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + String apiCode = apiTenantRel.getApiCode(); + queryWrapper.eq(StringUtils.isNotEmpty(apiCode), OcpApiBase::getApiCode, apiCode); + List list = apiBasicManagementMapper.selectList(queryWrapper); + return ResponseVO.ok(list); + } + + } + return ResponseVO.ok(); + } + /** * 应用树2 *