From a3f1a00078fa731b11826c2c54c005c31085bc4e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 26 七月 2021 13:15:37 +0800
Subject: [PATCH] udpate 更新 OSS模块 适配新规范
---
ruoyi-oss/src/main/java/com/ruoyi/system/service/ISysOssService.java | 6 +++---
ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java | 8 ++++----
ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java | 6 +++---
ruoyi-oss/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java | 2 +-
ruoyi-oss/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
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 3791030..45f838a 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.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 @@
@ApiOperation("鏌ヨOSS浜戝瓨鍌ㄥ垪琛�")
@PreAuthorize("@ss.hasPermi('system:oss:list')")
@GetMapping("/list")
- public TableDataInfo<SysOssVo> list(@Validated SysOssQueryBo bo) {
+ public TableDataInfo<SysOssVo> 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 a5f35c8..a30ff32 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 @@
@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 db4f28f..8bc59b2 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 df4ea93..4f998e0 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 @@
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 @@
*/
public interface ISysOssService extends IServicePlus<SysOss, SysOssVo> {
- TableDataInfo<SysOssVo> queryPageList(SysOssQueryBo sysOss);
+ TableDataInfo<SysOssVo> 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 bed8a04..5c34a5c 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.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 @@
public class SysOssServiceImpl extends ServicePlusImpl<SysOssMapper, SysOss, SysOssVo> implements ISysOssService {
@Override
- public TableDataInfo<SysOssVo> queryPageList(SysOssQueryBo bo) {
+ public TableDataInfo<SysOssVo> queryPageList(SysOssBo bo) {
PagePlus<SysOss, SysOssVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
return PageUtils.buildDataInfo(result);
}
- private LambdaQueryWrapper<SysOss> buildQueryWrapper(SysOssQueryBo bo) {
+ private LambdaQueryWrapper<SysOss> buildQueryWrapper(SysOssBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOss> lqw = Wrappers.lambdaQuery();
lqw.like(StrUtil.isNotBlank(bo.getFileName()), SysOss::getFileName, bo.getFileName());
--
Gitblit v1.9.3