From 54236876f2c42442def06e147647d2e8267f49d9 Mon Sep 17 00:00:00 2001 From: xxxxxwwwww <3040838740@qq.com> Date: Tue, 29 Mar 2022 19:12:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pms/ocp/controller/AppRegisterController.java | 4 ++++ src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java | 6 +++--- src/main/java/com/pms/ocp/model/dto/ImgDTO.java | 6 +++--- src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java | 6 +++--- src/main/java/com/pms/ocp/model/vo/ApiProvinceVo.java | 6 +++--- src/main/java/com/pms/ocp/model/vo/QueryAppInfoVO.java | 2 +- src/main/resources/mapper/AppRegisterMapper.xml | 4 ++-- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/AppRegisterController.java b/src/main/java/com/pms/ocp/controller/AppRegisterController.java index 5826cde..5261420 100644 --- a/src/main/java/com/pms/ocp/controller/AppRegisterController.java +++ b/src/main/java/com/pms/ocp/controller/AppRegisterController.java @@ -1,5 +1,6 @@ package com.pms.ocp.controller; +import com.pms.ocp.common.aspectj.WebLog; import com.pms.ocp.common.config.CreateGroups; import com.pms.ocp.common.utils.StringBusinessUtil; import com.pms.ocp.model.dto.AppRegisterDTO; @@ -31,6 +32,7 @@ public class AppRegisterController { @ApiOperation("新增应用注册") @PostMapping("addApp") + @WebLog(description = "新增应用注册") public ResponseVO addApp(@RequestBody @Validated(CreateGroups.class) AppRegisterDTO appRegisterDTO, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -42,6 +44,7 @@ public class AppRegisterController { @ApiOperation("查询应用目录") @PostMapping("getAppInfo") + @WebLog(description = "查询应用目录") public ResponseVO getAppInfo(@RequestBody @Validated QueryAppDTO queryAppDTO, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return StringBusinessUtil.verifyDispose(bindingResult); @@ -52,6 +55,7 @@ public class AppRegisterController { @ApiOperation("应用预览图") @PostMapping("addAppImgUrl") + @WebLog(description = "应用预览图") public ResponseVO addAppImgUrl(@RequestBody @Validated(CreateGroups.class) List imgDTO, BindingResult bindingResult) { if (bindingResult.hasErrors()) { 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 49ab5c8..6822d9b 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 0a2a6d8..f4d59e7 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 7ea1206..b21e55d 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 String iocn; + private byte[] iocn; @ApiModelProperty(value = "图片类型") private Object iocnKind; @@ -77,11 +77,11 @@ public class OcpTenantIocn implements Serializable { this.codeNo = codeNo; } - 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/model/vo/ApiProvinceVo.java b/src/main/java/com/pms/ocp/model/vo/ApiProvinceVo.java index d77da78..8b1cb53 100644 --- a/src/main/java/com/pms/ocp/model/vo/ApiProvinceVo.java +++ b/src/main/java/com/pms/ocp/model/vo/ApiProvinceVo.java @@ -48,7 +48,7 @@ public class ApiProvinceVo implements Serializable { @Excel(name = "服务厂商") private String apiUnit; @ApiModelProperty(value = "服务图标") - private String apiPic; + private byte[] apiPic; @ApiModelProperty(value = "服务返回体") private String apiResp; @ApiModelProperty(value = "服务请求体") @@ -137,11 +137,11 @@ public class ApiProvinceVo implements Serializable { this.apiUnit = apiUnit; } - public String getApiPic() { + public byte[] getApiPic() { return apiPic; } - public void setApiPic(String apiPic) { + public void setApiPic(byte[] apiPic) { this.apiPic = apiPic; } diff --git a/src/main/java/com/pms/ocp/model/vo/QueryAppInfoVO.java b/src/main/java/com/pms/ocp/model/vo/QueryAppInfoVO.java index d54a690..6fdc517 100644 --- a/src/main/java/com/pms/ocp/model/vo/QueryAppInfoVO.java +++ b/src/main/java/com/pms/ocp/model/vo/QueryAppInfoVO.java @@ -14,7 +14,7 @@ import lombok.Data; public class QueryAppInfoVO { @ApiModelProperty("应用图标") - private Object icon; + private byte[] icon; @ApiModelProperty("应用名称") private String appName; diff --git a/src/main/resources/mapper/AppRegisterMapper.xml b/src/main/resources/mapper/AppRegisterMapper.xml index 9c746a3..fe5b33b 100644 --- a/src/main/resources/mapper/AppRegisterMapper.xml +++ b/src/main/resources/mapper/AppRegisterMapper.xml @@ -16,10 +16,10 @@ INNER JOIN ocp_tenant_group g ON g.tenant_group_code = base.tenant_group_code WHERE icon.iocn_type = 'tenant' and icon.iocn_kind is null - base.professional_kind like CONCAT('%', #{dto.kind}, '%') + and base.professional_kind like '${dto.kind}' - and g.tenant_group_name like CONCAT('%', #{dto.type}, '%') + and g.tenant_group_name like '${dto.type}' -- 2.26.0