From 38887171eba561beee713133129fec0ab5fb4570 Mon Sep 17 00:00:00 2001
From: liukai <35074062@qq.com>
Date: Wed, 30 Mar 2022 09:20:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/ocp/mapper/PmsApiManagementMapper.java   |  6 +++---
 .../java/com/pms/ocp/model/dto/ApiBaseDto.java   | 10 ----------
 .../impl/PmsApiManagementServiceImpl.java        | 16 ++--------------
 .../resources/mapper/PmsApiManagementMapper.xml  |  8 ++++----
 4 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java b/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java
index a895423..e51e25f 100644
--- a/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java
@@ -18,11 +18,11 @@ public interface PmsApiManagementMapper extends BaseMapper<PmsApiManagement> {
 
     int addOag(PmsApiMangageApi pmsApiMangageApi);
 
-    int deleteApi( PmsApiMangageApi pmsApiMangageApi);
+    int deleteApi(PmsApiMangageApi pmsApiMangageApi);
 
-    List<OcpApiModelRel> getApiModel(OcpApiModelRel ocpApiModelRel);
+    int  getApiModel(String apiCode);
 
-    List<OcpApiTenantRel> getApitenant(OcpApiTenantRel ocpApiTenantRel);
+    int  getApitenant(String apiCode);
 
     int updatePamm(PmsApiMangageApi pmsApiMangageApi);
 
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 2adee52..459ab74 100644
--- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
+++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
@@ -21,9 +21,6 @@ public class ApiBaseDto implements Serializable {
     @ApiModelProperty("服务编码")
     private String apiCode;
 
-    @ApiModelProperty("服务名称")
-    private String apiName;
-
     @ApiModelProperty("服务分类编码")
     private String apiGroupCode;
 
@@ -64,13 +61,6 @@ public class ApiBaseDto implements Serializable {
     @ApiModelProperty("每页条数")
     private Integer pageSize;
 
-    public String getApiName() {
-        return apiName;
-    }
-
-    public void setApiName(String apiName) {
-        this.apiName = apiName;
-    }
 
     private List<String> apiGroupCodeList;
 
diff --git a/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java
index 202c48a..61ca298 100644
--- a/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java
@@ -75,21 +75,9 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
     @Override
     public ResponseResult deleteApi(PmsApiMangageApi pmsApiMangageApi) {
         //服务模型
-        OcpApiModelRel oamr = new OcpApiModelRel();
-        oamr.setApiCode(pmsApiMangageApi.getApiCode());
-        List<OcpApiModelRel> apiModel = pmsApiManagementMapper.getApiModel(oamr);
-
+        int apiModelCount = pmsApiManagementMapper.getApiModel(pmsApiMangageApi.getApiCode());
         //应用服务
-        OcpApiTenantRel oat = new OcpApiTenantRel();
-        oat.setApiCode(pmsApiMangageApi.getApiCode());
-        List<OcpApiTenantRel> apitenant = pmsApiManagementMapper.getApitenant(oat);
-            for (OcpApiModelRel ocpApiModelRel : apiModel) {
-                for (OcpApiTenantRel ocpApiTenantRel : apitenant) {
-                    if (ocpApiModelRel.getApiCode().equals(pmsApiMangageApi.getApiCode())||ocpApiTenantRel.getApiCode().equals(pmsApiMangageApi.getApiCode())){
-                        return ResponseResult.SUCCESS(false);
-                    }
-                }
-            }
+        int apiTenantCount  = pmsApiManagementMapper.getApitenant(pmsApiMangageApi.getApiCode());
         pmsApiManagementMapper.deleteApi(pmsApiMangageApi);
         return ResponseResult.SUCCESS(true);
         }
diff --git a/src/main/resources/mapper/PmsApiManagementMapper.xml b/src/main/resources/mapper/PmsApiManagementMapper.xml
index 08569c9..8894df7 100644
--- a/src/main/resources/mapper/PmsApiManagementMapper.xml
+++ b/src/main/resources/mapper/PmsApiManagementMapper.xml
@@ -89,13 +89,13 @@
         delete  from ocp_api_base oab where  oab.api_code = #{apiCode}
     </delete>
 
-    <select id="getApiModel" resultType="com.pms.ocp.model.entity.OcpApiModelRel">
-        select * from ocp_api_model_rel oam where  oam.api_code = #{apiCode}
+    <select id="getApiModel" parameterType="java.lang.String" resultType="java.lang.Integer">
+        select count(1) from ocp_api_model_rel oam where  oam.api_code = #{apiCode}
     </select>
 
 
-    <select id="getApitenant" resultType="com.pms.ocp.model.entity.OcpApiTenantRel">
-        select * from ocp_api_tenant_rel oatr where oatr.api_code = #{apiCode}
+    <select id="getApitenant" parameterType="java.lang.String" resultType="java.lang.Integer">
+        select count(1) from ocp_api_tenant_rel oatr where oatr.api_code = #{apiCode}
     </select>
 
 
-- 
2.26.0