diff --git a/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java b/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java index a8954231b86efd7fb10f5f59640c7d79718b72d4..e51e25fc3510c097c64f0dbbe69d852ceefcf586 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 { int addOag(PmsApiMangageApi pmsApiMangageApi); - int deleteApi( PmsApiMangageApi pmsApiMangageApi); + int deleteApi(PmsApiMangageApi pmsApiMangageApi); - List getApiModel(OcpApiModelRel ocpApiModelRel); + int getApiModel(String apiCode); - List 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 2adee52f03e3fffffe1dee25772059e01721e8d3..459ab7459b1ce0408a11ddcad0e0c9461fbee0d4 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 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 202c48ad1748d70dec72a738f4c2aa2fd00eaa90..61ca298521e3a55cb978574eabcfa81e3a27dacd 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 apiModel = pmsApiManagementMapper.getApiModel(oamr); - + int apiModelCount = pmsApiManagementMapper.getApiModel(pmsApiMangageApi.getApiCode()); //应用服务 - OcpApiTenantRel oat = new OcpApiTenantRel(); - oat.setApiCode(pmsApiMangageApi.getApiCode()); - List 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 08569c93a0b45eac02dcccca6b4b17a1f4b08847..8894df77ce20a7b8c903f82ef678df04a7346e57 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} - + select count(1) from ocp_api_model_rel oam where oam.api_code = #{apiCode} - + select count(1) from ocp_api_tenant_rel oatr where oatr.api_code = #{apiCode}