diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 655c868d129d5dac0dd8c6d1b0cf45ed3366f938..3b043a2868b7ed1f5cc774a54ed04b91f1d1a50f 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -212,10 +212,10 @@ public class ApiBasicManagementController { public ResponseVO> selectByCondition(@RequestParam(required = false) String apiCode, @RequestParam(required = false) String apiName, @RequestParam(required = false) String apiCenterCode, - @RequestParam(required = false) Integer pageNum, + @RequestParam(required = false) Integer currentPage, @RequestParam(required = false) Integer pageSize, @RequestParam(required = false) String apiGroupCode) { - return apiBasicManagementService.selectByCondition(apiCode, apiName, apiCenterCode, pageNum, pageSize, apiGroupCode); + return apiBasicManagementService.selectByCondition(apiCode, apiName, apiCenterCode, currentPage, pageSize, apiGroupCode); } 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 49ab5c8f545c784124caae0bfa4516657713a32d..6822d9b56f7445cf3bd68a60a6f26de37f9bb960 100644 --- a/src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java +++ b/src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java @@ -28,7 +28,7 @@ public class AppRegisterDTO { @ApiModelProperty("应用图标") @NotBlank(message = "应用图标不能为空", groups = CreateGroups.class) - private String imgUrl; + private byte[] imgUrl; @ApiModelProperty("应用名称") @NotBlank(message = "应用名称不能为空", groups = CreateGroups.class) @@ -165,11 +165,11 @@ public class AppRegisterDTO { this.time = time; } - public String getImgUrl() { + public byte[] getImgUrl() { return imgUrl; } - public void setImgUrl(String imgUrl) { + public void setImgUrl(byte[] imgUrl) { this.imgUrl = imgUrl; } 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 0a2a6d8115ae43dde6787ffd2a583e3d98a86552..f4d59e7e756d571bc8b64466eea4d2af0e617661 100644 --- a/src/main/java/com/pms/ocp/model/dto/ImgDTO.java +++ b/src/main/java/com/pms/ocp/model/dto/ImgDTO.java @@ -20,7 +20,7 @@ public class ImgDTO { @ApiModelProperty(value = "应用预览url") @NotBlank(message = "应用预览url不能为空", groups = CreateGroups.class) - private String img; + private byte[] img; public String getTenantCode() { return tenantCode; @@ -30,11 +30,11 @@ public class ImgDTO { this.tenantCode = tenantCode; } - public String getImg() { + public byte[] getImg() { return img; } - public void setImg(String img) { + public void setImg(byte[] img) { this.img = img; } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java index 417d23d8bc29f31ea925b16aae9b676a023c50ea..b21e55d7dd48a12643fcf516542ef8039d714bc6 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java @@ -40,7 +40,7 @@ public class OcpTenantIocn implements Serializable { * 应用调用的服务数量图标数据 */ @ApiModelProperty(value = "应用调用的服务数量图标数据") - private Object iocn; + private byte[] iocn; @ApiModelProperty(value = "图片类型") private Object iocnKind; @@ -77,11 +77,11 @@ public class OcpTenantIocn implements Serializable { this.codeNo = codeNo; } - public Object getIocn() { + public byte[] getIocn() { return iocn; } - public void setIocn(Object iocn) { + public void setIocn(byte[] iocn) { this.iocn = iocn; } diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index d1747ece8ea79178b15b9fefa50effbf01a78e7e..fd3716ac9aea862f62f1655ef666a0259b3b4af6 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -86,12 +86,12 @@ public interface ApiBasicManagementService extends IService { * @param apiCode * @param apiName * @param apiCenterCode - * @param pageNum + * @param currentPage * @param pageSize * @param apiGroupCode * @return */ - ResponseVO> selectByCondition(String apiCode, String apiName, String apiCenterCode,Integer pageNum,Integer pageSize,String apiGroupCode); + ResponseVO> selectByCondition(String apiCode, String apiName, String apiCenterCode,Integer currentPage,Integer pageSize,String apiGroupCode); /** * 省侧-应用接入申请-查询组中所有中心 diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java index 902983d8ca431a682619fd1005af126019aa1fc5..2edd4da33541888aa4e19579fadedfb48e60e549 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -262,17 +262,16 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl> selectByCondition(String apiCode, String apiName,String apiCenterCode ,Integer pageNum, Integer pageSize, String apiGroupCode) { - if (pageNum == null || pageSize == null) { + public ResponseVO> selectByCondition(String apiCode, String apiName,String apiCenterCode ,Integer currentPage, Integer pageSize, String apiGroupCode) { + if (currentPage == null || pageSize == null) { return ResponseVO.error("分页参数不能为空"); } - - PageHelper.startPage(pageNum, pageSize); + PageHelper.startPage(currentPage, pageSize); List list = apiBasicManagementMapper.selectByCondition(apiCode, apiName, apiCenterCode,apiGroupCode); PageInfo pageInfo = new PageInfo<>(list); return ResponseVO.ok(pageInfo); 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 33ad469d19b9e856cc235de5fe968281f5436dd6..00a5c8633a5ca5a70877ce95e18f57311ad45915 100644 --- a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; - /** * 应用注册业务接口实现 * @@ -56,24 +55,23 @@ public class AppRegisterServiceImpl implements AppRegisterService { ocpTenantIocn.setIocn(appRegisterDTO.getImgUrl()); int n = ocpTenantIocnMapper.insert(ocpTenantIocn); - OcpTenantExtent ocpTenantExtent = new OcpTenantExtent(); ocpTenantExtent.setTenantCtime(new Date()); ocpTenantExtent.setTenantCode(appRegisterDTO.getAppCode()); ocpTenantExtent.setClusterName(appRegisterDTO.getGroup()); ocpTenantExtent.setDeploymentName(appRegisterDTO.getDeploymentName()); + ocpTenantExtent.setIsDelete((short) 0); int j = ocpTenantExtentMapper.insert(ocpTenantExtent); - OcpTenantGroup ocpTenantGroup = new OcpTenantGroup(); ocpTenantGroup.setTenantGroupUserId(appRegisterDTO.getUserId()); ocpTenantGroup.setTenantGroupUserName(appRegisterDTO.getUserName()); ocpTenantGroup.setTenantGroupCtime(new Timestamp(System.currentTimeMillis())); ocpTenantGroup.setTenantGroupCode(GUIDGenerator.generate32(true)); ocpTenantGroup.setTenantGroupName(appRegisterDTO.getType()); + ocpTenantGroup.setIsDelete((short) 0); int m = ocpTenantGroupMapper.insert(ocpTenantGroup); - OcpTenantBase ocpTenantBase = new OcpTenantBase(); ocpTenantBase.setTenantUserId(appRegisterDTO.getUserId()); ocpTenantBase.setTenantName(appRegisterDTO.getAppName()); @@ -85,9 +83,9 @@ public class AppRegisterServiceImpl implements AppRegisterService { ocpTenantBase.setTenantVersion(appRegisterDTO.getVersion()); ocpTenantBase.setTenantCtime(new Timestamp(System.currentTimeMillis())); ocpTenantBase.setTenantGroupCode(ocpTenantGroup.getTenantGroupCode()); + ocpTenantBase.setIsDelete((short) 0); int i = ocpTenantBaseMapper.insert(ocpTenantBase); - if (n > 0 && i > 0 && j > 0 && m > 0) { return ResponseVO.ok(); } 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 e1a8fbe721f273b9387cb9930dd466ac3d009f21..086c06eea07d16bc9169b441d65b3495769fb88e 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -409,6 +409,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); lambdaQueryWrapper2.eq(OcpTenantBase::getTenantCode, tenantCode); // boolean flag = this.update(ocpTenantBase, lambdaQueryWrapper2); @@ -437,11 +439,10 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl