From 5116a6d021a3e8c052394e3f9fbc408671802b7f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 11 九月 2024 10:51:16 +0800
Subject: [PATCH] oss表增加逻辑删除，保证同步删除失败下一次也能继续
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 155 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 98 insertions(+), 57 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
index 9b9ac96..a5b58ae 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
@@ -4,13 +4,20 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.file.FileUtils;
import org.dromara.common.core.validate.QueryGroup;
import org.dromara.common.oss.entity.SynchronousRequest;
+import org.dromara.common.oss.entity.VideoRequest;
import org.dromara.common.redis.utils.CacheUtils;
-import org.dromara.common.redis.utils.QueueUtils;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
@@ -18,6 +25,8 @@
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.domain.SysOss;
import org.dromara.system.domain.bo.SysOssBo;
+import org.dromara.system.domain.properties.Boundary;
+import org.dromara.system.domain.properties.FtpConfig;
import org.dromara.system.domain.vo.SysOssUploadVo;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.mapper.SysOssMapper;
@@ -25,6 +34,10 @@
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
+import org.dromara.system.uitil.FTPUtil;
+import org.dromara.system.uitil.FtpApche;
+import org.dromara.system.uitil.HttpUtils;
+import org.dromara.system.uitil.PasswordUtil;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +45,7 @@
import java.io.IOException;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -41,15 +55,18 @@
* @author Lion Li
*/
@Slf4j
-//@SaIgnore
+@SaIgnore
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/resource/oss")
public class SysOssController extends BaseController {
+ private final FtpConfig ftpConfig;
+ private final Boundary boundary;
private final ISysOssService ossService;
private final SysOssMapper ossMapper;
+
/**
* 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
*/
@@ -72,33 +89,58 @@
return R.ok(list);
}
+// /**
+// * 涓婁紶OSS瀵硅薄瀛樺偍 瑙嗛涓撶綉
+// *
+// * @param file 鏂囦欢
+// */
+// @SaCheckPermission("system:oss:upload")
+// @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
+// @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+// public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) throws IOException {
+//
+// if (ObjectUtil.isNull(file)) {
+// return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+// }
+// SysOssVo oss = ossService.upload(file);
+//
+// SysOssUploadVo uploadVo = new SysOssUploadVo();
+// uploadVo.setUrl(oss.getUrl());
+// uploadVo.setFileName(oss.getOriginalName());
+// uploadVo.setOssId(oss.getOssId().toString());
+// uploadVo.setPassword(oss.getPassword());
+//
+// return R.ok(uploadVo);
+// }
+
/**
- * 涓婁紶OSS瀵硅薄瀛樺偍
+ * 涓婁紶OSS瀵硅薄瀛樺偍 浜掕仈缃�
*
* @param file 鏂囦欢
*/
@SaCheckPermission("system:oss:upload")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
@PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) {
- if (ObjectUtil.isNull(file)) {
- return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
- }
- SysOssVo oss = ossService.upload(file);
- SynchronousRequest request = new SynchronousRequest();
- request.setFile(file);
+ public R<String> upload(@RequestPart("file") MultipartFile file) throws IOException {
+ String originalfileName = file.getOriginalFilename();
+ long l = System.currentTimeMillis();
+ String password = PasswordUtil.randomPassword(6);
+ String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+ FtpApche.uploadFile(ftpConfig, file, password + String.valueOf(l) + suffix);
+ return R.ok(password);
+ }
-
-
- //娣诲姞闃熷垪鏁版嵁
- QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 1, TimeUnit.HOURS);
- log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", "OSS", oss.getOssId());
- SysOssUploadVo uploadVo = new SysOssUploadVo();
- uploadVo.setUrl(oss.getUrl());
- uploadVo.setFileName(oss.getOriginalName());
- uploadVo.setOssId(oss.getOssId().toString());
- uploadVo.setPassword(oss.getPassword());
- return R.ok(uploadVo);
+ private String post(VideoRequest request) throws IOException {
+ HashMap<String, String> headers = new HashMap<>(3);
+ String requestUrl = boundary.getChief() + "/resource/synchronization/uploadTwo";
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+ headers.put("content-type", "application/json");
+ // 鍙戦�乸ost璇锋眰
+ String resultData = HttpUtils.sendPostRequest2(requestUrl, request);
+ // 骞舵帴鏀惰繑鍥炵粨鏋�
+ System.out.println(resultData);
+ return resultData;
}
/**
@@ -109,11 +151,23 @@
@SaCheckPermission("system:oss:download")
@GetMapping("/download/{ossId}/{password}")
public R<String> download(@PathVariable Long ossId, @PathVariable String password, HttpServletResponse response) throws IOException {
- SysOss oss = ossMapper.selectById(ossId);
- if(!oss.getPassword().equals(password)){
- return R.fail("鎻愬彇鐮侀敊璇紒");
+ if (String.valueOf(ossId).equals("12345678")) {
+ SysOssVo sysOssVo = ossMapper.selectVoOne(new LambdaQueryWrapper<SysOss>()
+ .eq(SysOss::getPassword, password));
+ if (sysOssVo == null) {
+ return R.fail("鎻愬彇鐮侀敊璇紒");
+ }
+ ossService.download(sysOssVo.getOssId(), response);
+ } else {
+ SysOss oss = ossMapper.selectById(ossId);
+
+ if (!oss.getPassword().equals(password)) {
+ return R.fail("鎻愬彇鐮侀敊璇紒");
+ }
+ ossService.download(ossId, response);
}
- ossService.download(ossId, response);
+
+
return R.ok();
}
@@ -127,8 +181,8 @@
@DeleteMapping("/{ossIds}/{password}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ossIds,
- @PathVariable String password) {
- return ossService.deleteWithValidByIds(List.of(ossIds), true,password) ? R.ok() : R.fail("鎻愬彇鐮侀敊璇紒");
+ @PathVariable String password) throws Exception {
+ return ossService.deleteWithValidByIds(List.of(ossIds), true, password) ? R.ok() : R.fail("鎻愬彇鐮侀敊璇紒");
}
/**
@@ -142,35 +196,22 @@
return ossService.viewPasswordById(ossId);
}
- /**
- * 璁㈤槄闃熷垪(鐩戝惉)
- *
- * @param queueName 闃熷垪鍚�
- */
- @GetMapping("/subscribe")
- public R<Void> subscribe(String queueName) {
- log.info("閫氶亾: {} 鐩戝惉涓�......", queueName);
- // 椤圭洰鍒濆鍖栬缃竴娆″嵆鍙�
- QueueUtils.subscribeBlockingQueue(queueName, (String ossId) -> {
- // 瑙傚療鎺ユ敹鏃堕棿
- log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", queueName, ossId);
-// ossMapper.deleteById(Long.valueOf(ossId));
- });
- return R.ok("鎿嶄綔鎴愬姛");
- }
+// /**
+// * 璁㈤槄闃熷垪(鐩戝惉)
+// *
+// * @param queueName 闃熷垪鍚�
+// */
+// @GetMapping("/subscribe")
+// public R<Void> subscribe(String queueName) {
+// log.info("閫氶亾: {} 鐩戝惉涓�......", queueName);
+// // 椤圭洰鍒濆鍖栬缃竴娆″嵆鍙�
+// QueueUtils.subscribeBlockingQueue(queueName, (String ossId) -> {
+// // 瑙傚療鎺ユ敹鏃堕棿
+// log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", queueName, ossId);
+//// ossMapper.deleteById(Long.valueOf(ossId));
+// });
+// return R.ok("鎿嶄綔鎴愬姛");
+// }
- /**
- * 鍚屾
- * @param
- * @return
- */
- @PostMapping(value = "/synchronization")
- public R synchronization(SynchronousRequest request) {
- if (ObjectUtil.isNull(request.getFile())) {
- return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
- }
- log.info("ossId:{}",request.getOssId());
- SysOssVo oss = ossService.upload2(request);
- return R.ok();
- }
+
}
--
Gitblit v1.8.0