From 016088d524d380d27763bd7adc7bb6292f8a2b2f 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 17:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=20=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=9C=8D=E5=8A=A1=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiBasicManagementController.java         |  1 +
 .../TenantBasicManagementController.java      |  7 +++-
 .../service/TenantBasicManagementService.java |  7 ++++
 .../TenantBasicManagementServiceImpl.java     | 36 +++++++++++++++++++
 .../resources/mapper/OcpApiGroupMapper.xml    |  2 +-
 src/main/resources/mapper/OcpGroup.xml        |  2 +-
 6 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
index b205476..27a967f 100644
--- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
+++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
@@ -221,4 +221,5 @@ public class ApiBasicManagementController {
     }
 
 
+
 }
diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
index 1a0fe9a..fc72d1e 100644
--- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
+++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
@@ -131,8 +131,13 @@ public class TenantBasicManagementController {
       return  tenantBasicManagementService.updateByCondition(ocpBaseTiocnDto);
     }
     @ApiOperation("个人信息中-查询和应用关联的服务")
-    @PostMapping("/selectOcpByApi")
+    @GetMapping("/selectOcpByApi")
     public ResponseVO<List<OcpApiBase>> selectOcpByApi(@RequestParam(required = false) String tenantCode){
         return  tenantBasicManagementService.selectOcpByApi(tenantCode);
     }
+   @ApiOperation("添加应用服务关系")
+   @PostMapping("/saveTenantAndApi")
+    public ResponseVO saveTenantAndApi(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){
+        return tenantBasicManagementService.saveTenantAndApi(ocpBaseTiocnDto);
+   }
 }
diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
index 09616c1..aa57fd2 100644
--- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
+++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
@@ -102,6 +102,13 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
      */
     ResponseVO <List<OcpApiBase>>selectOcpByApi(String tenantCode);
 
+    /**
+     * 添加应用服务关系
+
+     * @return
+     */
+    ResponseVO saveTenantAndApi( OcpBaseTiocnDto ocpBaseTiocnDto);
+
     /**
      * 应用树
      * @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 7098498..3100532 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
@@ -424,6 +424,42 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         return ResponseVO.ok();
     }
 
+    /**
+     * 添加应用服务关系
+     *
+     * @return
+     */
+    @Override
+    public ResponseVO saveTenantAndApi(OcpBaseTiocnDto ocpBaseTiocnDto) {
+        String apiCodes = ocpBaseTiocnDto.getApiCodes();
+        String tenantCode = ocpBaseTiocnDto.getTenantCode();
+        String[] split = apiCodes.split(",");
+        List<String> apiCode = Arrays.asList(split);
+        if (apiCode.size() == 0) {
+            return ResponseVO.error("请选择你要关联的服务");
+        }
+        //先删除之前关联的
+        LambdaQueryWrapper<OcpApiTenantRel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(tenantCode), OcpApiTenantRel::getTenantCode, tenantCode);
+        ocpApiTenantRelMapper.delete(queryWrapper);
+        for (String s : apiCode) {
+            OcpApiTenantRel rel = new OcpApiTenantRel();
+            rel.setApiCode(s);
+            rel.setTenantCode(tenantCode);
+            rel.setApiTenantRelMtime(new Timestamp(System.currentTimeMillis()));
+            rel.setApiTenantRelCtime(new Timestamp(System.currentTimeMillis()));
+            rel.setApiDepCompanyCode(ocpBaseTiocnDto.getOwnerCompanyCode());
+            rel.setTenantDepCompanyCode(ocpBaseTiocnDto.getOwnerCompanyCode());
+            int insert = ocpApiTenantRelMapper.insert(rel);
+            if (insert > 0) {
+                return ResponseVO.ok("添加成功");
+            } else {
+                return ResponseVO.error("添加失败");
+            }
+        }
+        return ResponseVO.error("系统异常");
+    }
+
     /**
      * 应用树2
      *
diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml
index 33dc7f5..485a79d 100644
--- a/src/main/resources/mapper/OcpApiGroupMapper.xml
+++ b/src/main/resources/mapper/OcpApiGroupMapper.xml
@@ -53,7 +53,7 @@
     <select id="apiTree" resultType="com.pms.ocp.model.dto.OcpGroupBaseDto">
         select api_group_code,api_group_name,api_group_pcode,api_group_level from ocp_api_group where is_delete = 0
 
-        <if test="apiGroupPcode == null">
+        <if test="apiGroupPcode == null ">
             and api_group_pcode is null or api_group_pcode =''
         </if>
         <if test="apiGroupPcode!=null and apiGroupPcode!=''">
diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml
index d42640a..d75ebf6 100644
--- a/src/main/resources/mapper/OcpGroup.xml
+++ b/src/main/resources/mapper/OcpGroup.xml
@@ -20,7 +20,7 @@
         select
         tenant_group_code,tenant_group_name,tenant_group_pcode ,tenant_group_level from ocp_tenant_group
         where is_delete = 0
-        <if test="tenantGroupCode == null">
+        <if test="tenantGroupCode == null ">
             and tenant_group_pcode = '' or tenant_group_pcode is null
         </if>
         <if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode !=''">
-- 
2.26.0