diff --git a/operation-control-platform.iml b/operation-control-platform.iml index 5b69609f4a718d0f8f2cd62f019d95b4272cd7bd..c91bcf0fbb0a59c2df466658e35f089f9bcfd41c 100644 --- a/operation-control-platform.iml +++ b/operation-control-platform.iml @@ -1,10 +1,5 @@ - - - @@ -82,7 +77,6 @@ - @@ -115,6 +109,7 @@ + diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java index 65327384abfb7bddd3177f46715ea30288b3e09f..3f66a96a14b60c335e902a1d0fd431c2aa1861bf 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java @@ -9,10 +9,16 @@ import java.util.List; public interface OcpTenantBaseMapper extends BaseMapper { - - OcpTenantBase updataIsDelect(String objId,Short isDelete); + OcpTenantBase updataIsDelect(String objId, Short isDelete); List selectAlls(); + /** + * 查询数据库中是否有现有应用编码 + * + * @param appCode + * @return + */ + int queryCount(String appCode); } 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 44daecbefadeeb5d51c57d4fd002b4802fae9ef0..5b0a0b313bc12f1677df3985238f12b6f3b30c63 100644 --- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java @@ -21,6 +21,8 @@ public class ApiBaseDto implements Serializable { @ApiModelProperty("服务编码") private String apiCode; + @ApiModelProperty("服务名称") + private String apiName; @ApiModelProperty("服务分类编码") private String apiGroupCode; @@ -200,4 +202,20 @@ public class ApiBaseDto implements Serializable { public void setApiGroupName(String apiGroupName) { this.apiGroupName = apiGroupName; } + + public String getApiName() { + return apiName; + } + + public void setApiName(String apiName) { + this.apiName = apiName; + } + + public Integer getCurrentPage() { + return currentPage; + } + + public void setCurrentPage(Integer currentPage) { + this.currentPage = currentPage; + } } diff --git a/src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java b/src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java index 6822d9b56f7445cf3bd68a60a6f26de37f9bb960..b6e43c9d447dd73bb6f15a1363c72d9969bf34dd 100644 --- a/src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java +++ b/src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java @@ -27,7 +27,7 @@ public class AppRegisterDTO { @ApiModelProperty("应用图标") - @NotBlank(message = "应用图标不能为空", groups = CreateGroups.class) +// @NotBlank(message = "应用图标不能为空", groups = CreateGroups.class) private byte[] imgUrl; @ApiModelProperty("应用名称") diff --git a/src/main/java/com/pms/ocp/model/dto/ImgDTO.java b/src/main/java/com/pms/ocp/model/dto/ImgDTO.java index f4d59e7e756d571bc8b64466eea4d2af0e617661..cd4f9b6a3984099c3ab1fd6bc878f533e96b5c3c 100644 --- a/src/main/java/com/pms/ocp/model/dto/ImgDTO.java +++ b/src/main/java/com/pms/ocp/model/dto/ImgDTO.java @@ -19,7 +19,7 @@ public class ImgDTO { private String tenantCode; @ApiModelProperty(value = "应用预览url") - @NotBlank(message = "应用预览url不能为空", groups = CreateGroups.class) +// @NotBlank(message = "应用预览url不能为空", groups = CreateGroups.class) private byte[] img; public String getTenantCode() { diff --git a/src/main/java/com/pms/ocp/model/dto/OcpBaseTiocnDto.java b/src/main/java/com/pms/ocp/model/dto/OcpBaseTiocnDto.java index 75141499316da43651cac36faf6453da8d450b16..58677398c106c2a5c88daa3f7d5b2d5e970edcc6 100644 --- a/src/main/java/com/pms/ocp/model/dto/OcpBaseTiocnDto.java +++ b/src/main/java/com/pms/ocp/model/dto/OcpBaseTiocnDto.java @@ -31,7 +31,7 @@ public class OcpBaseTiocnDto extends OcpTenantBase implements Serializable { * 应用调用的服务数量图标数据 */ @ApiModelProperty(value = "应用调用的服务数量图标数据") - private String iocn; + private byte[] iocn; @ApiModelProperty(value = "图片类型") private Object iocnKind; @@ -47,11 +47,11 @@ public class OcpBaseTiocnDto extends OcpTenantBase implements Serializable { this.iocnType = iocnType; } - public String getIocn() { + public byte[] getIocn() { return iocn; } - public void setIocn(String iocn) { + public void setIocn(byte[] iocn) { this.iocn = iocn; } diff --git a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java index 735a10cfbd2bc29befddef268605a5a671bbf8de..e4500171c289295342660c0d7e2d661839b538f2 100644 --- a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java @@ -49,6 +49,11 @@ public class AppRegisterServiceImpl implements AppRegisterService { @Override public ResponseVO addApp(AppRegisterDTO appRegisterDTO) { + int count = ocpTenantBaseMapper.queryCount(appRegisterDTO.getAppCode()); + if (count != 0) { + return ResponseVO.error("应用编码有重复"); + } + OcpTenantIocn ocpTenantIocn = new OcpTenantIocn(); ocpTenantIocn.setIocnType("tenant"); ocpTenantIocn.setCodeNo(appRegisterDTO.getAppCode()); 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 f022617595d5ce76ea86437414a714fc15adff00..610afd96be6961e208b80317d3319e759d48ab94 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -454,7 +454,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl - + + + \ No newline at end of file