From 15e8b9f998c99dc19a07fffac91a7982e724aeff Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 二月 2025 10:23:00 +0800
Subject: [PATCH] 独立删除逻辑
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index 345b542..5170845 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -45,6 +45,7 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.*;
@@ -202,29 +203,29 @@
request.getPassword(), "1731588854831022081", request.getFileName(), request.getCreateTime());
}
- /**
- * 鍚屾 瀹氭椂鎷夊彇
- * @param
- * @param
- * @return
- */
- @Override
- public SysOssVo upload3(SynchronousRequest request) throws ParseException {
- String originalfileName = request.getFileName();
- String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
- OssClient storage = OssFactory.instance();
- UploadResult uploadResult;
- try {
- uploadResult = storage.uploadSuffix2(request.getFile().getBytes(), request.getPath(), request.getFile().getContentType());
- } catch (IOException e) {
- throw new ServiceException(e.getMessage());
- }
- // 淇濆瓨鏂囦欢淇℃伅
- System.out.println("canshu:" + "," + originalfileName +"," + suffix +"," + storage.getConfigKey() +"," + uploadResult + "," +request.getOssId()
- +"," + request.getPassword() +"," + request.getCreateBy() +"," + request.getFileName() +"," + request.getCreateTime());
- return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
- request.getPassword(), "1731588854831022081", request.getFileName(), request.getCreateTime());
- }
+// /**
+// * 鍚屾 瀹氭椂鎷夊彇
+// * @param
+// * @param
+// * @return
+// */
+// @Override
+// public SysOssVo upload3(SynchronousRequest request) throws ParseException {
+// String originalfileName = request.getFileName();
+// String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+// OssClient storage = OssFactory.instance();
+// UploadResult uploadResult;
+// try {
+// uploadResult = storage.uploadSuffix2(request.getFile().getBytes(), request.getPath(), request.getFile().getContentType());
+// } catch (IOException e) {
+// throw new ServiceException(e.getMessage());
+// }
+// // 淇濆瓨鏂囦欢淇℃伅
+// System.out.println("canshu:" + "," + originalfileName +"," + suffix +"," + storage.getConfigKey() +"," + uploadResult + "," +request.getOssId()
+// +"," + request.getPassword() +"," + request.getCreateBy() +"," + request.getFileName() +"," + request.getCreateTime());
+// return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
+// request.getPassword(), "1731588854831022081", request.getFileName(), request.getCreateTime());
+// }
// @Override
// public SysOssVo upload(File file) {
@@ -307,7 +308,7 @@
storage.delete(sysOss.getUrl());
if(sysOss.getPassword().equals(password) || password.equals("000000")){
baseMapper.deleteById(sysOss.getOssId());
-// HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
+ HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
return true;
}
return false;
@@ -315,7 +316,16 @@
return true;
}
-
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteByIds(Collection<Long> ids) {
+ List<SysOss> list = baseMapper.selectBatchIds(ids);
+ for (SysOss sysOss : list) {
+ OssClient storage = OssFactory.instance(sysOss.getService());
+ storage.delete(sysOss.getUrl());
+ baseMapper.deleteById(sysOss.getOssId());
+ }
+ }
@Override
public R viewPasswordById(Long ossId) {
--
Gitblit v1.8.0