From 9f6f07f1649f01258aaad541d9fa1dfca63641c0 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期一, 04 十二月 2023 11:59:58 +0800
Subject: [PATCH] 日期
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 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 73ada3b..690abf2 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
@@ -2,17 +2,25 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.QueryGroup;
+import org.dromara.common.oss.entity.SynchronousRequest;
+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;
import org.dromara.common.mybatis.core.page.PageQuery;
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.vo.SysOssUploadVo;
import org.dromara.system.domain.vo.SysOssVo;
+import org.dromara.system.mapper.SysOssMapper;
import org.dromara.system.service.ISysOssService;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
@@ -25,12 +33,15 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* 鏂囦欢涓婁紶 鎺у埗灞�
*
* @author Lion Li
*/
+@Slf4j
+//@SaIgnore
@Validated
@RequiredArgsConstructor
@RestController
@@ -38,7 +49,7 @@
public class SysOssController extends BaseController {
private final ISysOssService ossService;
-
+ private final SysOssMapper ossMapper;
/**
* 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
*/
@@ -69,15 +80,24 @@
@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) {
+ public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) throws IOException {
if (ObjectUtil.isNull(file)) {
return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
SysOssVo oss = ossService.upload(file);
+ SynchronousRequest request = new SynchronousRequest();
+ request.setFile(file);
+
+
+
+ //娣诲姞闃熷垪鏁版嵁
+ QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 300, TimeUnit.SECONDS);
+ 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);
}
@@ -87,9 +107,14 @@
* @param ossId OSS瀵硅薄ID
*/
@SaCheckPermission("system:oss:download")
- @GetMapping("/download/{ossId}")
- public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
+ @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("鎻愬彇鐮侀敊璇紒");
+ }
ossService.download(ossId, response);
+ return R.ok();
}
/**
@@ -99,10 +124,40 @@
*/
@SaCheckPermission("system:oss:remove")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ossIds}")
+ @DeleteMapping("/{ossIds}/{password}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ossIds) {
- return toAjax(ossService.deleteWithValidByIds(List.of(ossIds), true));
+ @PathVariable Long[] ossIds,
+ @PathVariable String password) throws Exception {
+ return ossService.deleteWithValidByIds(List.of(ossIds), true,password) ? R.ok() : R.fail("鎻愬彇鐮侀敊璇紒");
}
+ /**
+ * 鏌ョ湅OSS瀵硅薄瀛樺偍涓存椂瀵嗙爜
+ *
+ * @param ossId OSS瀵硅薄ID
+ */
+ @SaCheckPermission("system:oss:view")
+ @GetMapping("/{ossId}")
+ public R<String> view(@PathVariable Long ossId) {
+ 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("鎿嶄綔鎴愬姛");
+ }
+
+
}
--
Gitblit v1.8.0