From a3f1a00078fa731b11826c2c54c005c31085bc4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Mon, 26 Jul 2021 13:15:37 +0800 Subject: [PATCH] =?UTF-8?q?udpate=20=E6=9B=B4=E6=96=B0=20OSS=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20=E9=80=82=E9=85=8D=E6=96=B0=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/controller/SysOssController.java | 6 +++--- .../{bo/SysOssQueryBo.java => domain/bo/SysOssBo.java} | 4 ++-- .../java/com/ruoyi/system/{ => domain}/vo/SysOssVo.java | 2 +- .../java/com/ruoyi/system/service/ISysOssService.java | 6 +++--- .../com/ruoyi/system/service/impl/SysOssServiceImpl.java | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) rename ruoyi-oss/src/main/java/com/ruoyi/system/{bo/SysOssQueryBo.java => domain/bo/SysOssBo.java} (93%) rename ruoyi-oss/src/main/java/com/ruoyi/system/{ => domain}/vo/SysOssVo.java (96%) diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java b/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java index 37910304..45f838af 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java @@ -11,10 +11,10 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.system.bo.SysOssQueryBo; +import com.ruoyi.system.domain.bo.SysOssBo; import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.service.ISysOssService; -import com.ruoyi.system.vo.SysOssVo; +import com.ruoyi.system.domain.vo.SysOssVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -56,7 +56,7 @@ public class SysOssController extends BaseController { @ApiOperation("查询OSS云存储列表") @PreAuthorize("@ss.hasPermi('system:oss:list')") @GetMapping("/list") - public TableDataInfo list(@Validated SysOssQueryBo bo) { + public TableDataInfo list(@Validated SysOssBo bo) { return iSysOssService.queryPageList(bo); } diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/bo/SysOssQueryBo.java b/ruoyi-oss/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java similarity index 93% rename from ruoyi-oss/src/main/java/com/ruoyi/system/bo/SysOssQueryBo.java rename to ruoyi-oss/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java index a5f35c8d..a30ff322 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/system/bo/SysOssQueryBo.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.bo; +package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; @@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @ApiModel("OSS云存储分页查询对象") -public class SysOssQueryBo extends BaseEntity { +public class SysOssBo extends BaseEntity { /** * 分页大小 diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/vo/SysOssVo.java b/ruoyi-oss/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java similarity index 96% rename from ruoyi-oss/src/main/java/com/ruoyi/system/vo/SysOssVo.java rename to ruoyi-oss/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java index db4f28f7..8bc59b2c 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/system/vo/SysOssVo.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.vo; +package com.ruoyi.system.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java b/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java index df4ea933..4f998e0f 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java @@ -2,9 +2,9 @@ package com.ruoyi.system.service; import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.bo.SysOssQueryBo; +import com.ruoyi.system.domain.bo.SysOssBo; import com.ruoyi.system.domain.SysOss; -import com.ruoyi.system.vo.SysOssVo; +import com.ruoyi.system.domain.vo.SysOssVo; import org.springframework.web.multipart.MultipartFile; import java.util.Collection; @@ -16,7 +16,7 @@ import java.util.Collection; */ public interface ISysOssService extends IServicePlus { - TableDataInfo queryPageList(SysOssQueryBo sysOss); + TableDataInfo queryPageList(SysOssBo sysOss); SysOss upload(MultipartFile file); diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java index bed8a048..5c34a5c0 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java @@ -11,11 +11,11 @@ import com.ruoyi.common.utils.PageUtils; import com.ruoyi.oss.entity.UploadResult; import com.ruoyi.oss.factory.OssFactory; import com.ruoyi.oss.service.ICloudStorageService; -import com.ruoyi.system.bo.SysOssQueryBo; +import com.ruoyi.system.domain.bo.SysOssBo; import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.mapper.SysOssMapper; import com.ruoyi.system.service.ISysOssService; -import com.ruoyi.system.vo.SysOssVo; +import com.ruoyi.system.domain.vo.SysOssVo; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -33,12 +33,12 @@ import java.util.Map; public class SysOssServiceImpl extends ServicePlusImpl implements ISysOssService { @Override - public TableDataInfo queryPageList(SysOssQueryBo bo) { + public TableDataInfo queryPageList(SysOssBo bo) { PagePlus result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo)); return PageUtils.buildDataInfo(result); } - private LambdaQueryWrapper buildQueryWrapper(SysOssQueryBo bo) { + private LambdaQueryWrapper buildQueryWrapper(SysOssBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.like(StrUtil.isNotBlank(bo.getFileName()), SysOss::getFileName, bo.getFileName());