From e6c9d58c810d9a134b5c0b405e5c31a698b86b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= <hello@itcast.cn>
Date: Sat, 26 Mar 2022 11:56:34 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=20=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=92=8C=E5=BA=94=E7=94=A8=E5=85=B3=E8=81=94=E7=9A=84?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TenantBasicManagementController.java      |  7 +++++
 .../mapper/TenantBasicManagementMapper.java   |  2 ++
 .../service/TenantBasicManagementService.java | 11 +++++--
 .../TenantBasicManagementServiceImpl.java     | 31 +++++++++++++++++++
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
index bbe8ccf..1a0fe9a 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<List<OcpApiBase>> 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 7bc6059..5983ab9 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 a1cec12..09616c1 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<OcpTenantBase> {
      */
     ResponseVO updateByCondition(OcpBaseTiocnDto ocpBaseTiocnDto);
 
+    /**
+     * 个人信息中-查询和应用关联的服务
+     * @param tenantCode
+     * @return
+     */
+    ResponseVO <List<OcpApiBase>>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 265b8eb..7098498 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<TenantBasicMan
     @Autowired
     private OcpApiTenantRelService ocpApiTenantRelService;
     @Autowired
+    private OcpApiTenantRelMapper ocpApiTenantRelMapper;
+    @Autowired
     private OcpTenantGroupService ocpTenantGroupService;
     @Autowired
     private OcpTenantGroupMapper ocpTenantGroupMapper;
@@ -49,6 +51,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
     private OcpTenantAuditMapper ocpTenantAuditMapper;
     @Autowired
     private OcpTenantIocnService ocpTenantIocnService;
+    @Autowired
+    private ApiBasicManagementMapper apiBasicManagementMapper;
     List<String> tenantGroup = new ArrayList<>();
 
     /**
@@ -393,6 +397,33 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         return ResponseVO.ok();
     }
 
+    /**
+     * 个人信息中-查询和应用关联的服务
+     *
+     * @param tenantCode
+     * @return
+     */
+    @Override
+    public ResponseVO<List<OcpApiBase>> selectOcpByApi(String tenantCode) {
+        LambdaQueryWrapper<OcpApiTenantRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(StringUtils.isNotEmpty(tenantCode), OcpApiTenantRel::getTenantCode, tenantCode);
+        List<OcpApiTenantRel> ocpApiTenantRel = ocpApiTenantRelMapper.selectList(lambdaQueryWrapper);
+
+        if (ocpApiTenantRel.size() == 0) {
+            return ResponseVO.ok(Collections.EMPTY_LIST);
+        } else {
+            for (OcpApiTenantRel apiTenantRel : ocpApiTenantRel) {
+                LambdaQueryWrapper<OcpApiBase> queryWrapper = new LambdaQueryWrapper<>();
+                String apiCode = apiTenantRel.getApiCode();
+                queryWrapper.eq(StringUtils.isNotEmpty(apiCode), OcpApiBase::getApiCode, apiCode);
+                List<OcpApiBase> list = apiBasicManagementMapper.selectList(queryWrapper);
+                return ResponseVO.ok(list);
+            }
+
+        }
+        return ResponseVO.ok();
+    }
+
     /**
      * 应用树2
      *
-- 
2.26.0