From 0a128e454cf644d094eccf4b8790f217f28e94f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 七月 2021 19:40:18 +0800
Subject: [PATCH] update 编写 Minio 实现 调整OSS模块结构
---
ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
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 eacd8a0..994458b 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
@@ -8,6 +8,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.CustomException;
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;
@@ -41,10 +42,11 @@
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOss> lqw = Wrappers.lambdaQuery();
lqw.like(StrUtil.isNotBlank(bo.getFileName()), SysOss::getFileName, bo.getFileName());
+ lqw.like(StrUtil.isNotBlank(bo.getOriginalName()), SysOss::getOriginalName, bo.getOriginalName());
lqw.eq(StrUtil.isNotBlank(bo.getFileSuffix()), SysOss::getFileSuffix, bo.getFileSuffix());
lqw.eq(StrUtil.isNotBlank(bo.getUrl()), SysOss::getUrl, bo.getUrl());
lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
- SysOss::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime"));
+ SysOss::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
lqw.eq(StrUtil.isNotBlank(bo.getCreateBy()), SysOss::getCreateBy, bo.getCreateBy());
lqw.eq(StrUtil.isNotBlank(bo.getService()), SysOss::getService, bo.getService());
return lqw;
@@ -54,24 +56,27 @@
public SysOss upload(MultipartFile file) {
String originalfileName = file.getOriginalFilename();
String suffix = StrUtil.sub(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+ ICloudStorageService storage = OssFactory.instance();
+ UploadResult uploadResult;
try {
- ICloudStorageService storage = OssFactory.instance();
- String url = storage.uploadSuffix(file.getBytes(), suffix);
- // 淇濆瓨鏂囦欢淇℃伅
- SysOss oss = new SysOss()
- .setUrl(url).setFileSuffix(suffix)
- .setFileName(originalfileName)
- .setService(storage.getServiceType());
- save(oss);
- return oss;
+ uploadResult = storage.uploadSuffix(file.getBytes(), suffix);
} catch (IOException e) {
throw new CustomException("鏂囦欢璇诲彇寮傚父!!!", e);
}
+ // 淇濆瓨鏂囦欢淇℃伅
+ SysOss oss = new SysOss()
+ .setUrl(uploadResult.getUrl())
+ .setFileSuffix(suffix)
+ .setFileName(uploadResult.getFilename())
+ .setOriginalName(originalfileName)
+ .setService(storage.getServiceType());
+ save(oss);
+ return oss;
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
- if(isValid){
+ if (isValid) {
// 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
}
List<SysOss> list = listByIds(ids);
--
Gitblit v1.9.3