From badc83cad7a47ec00af8a45a3d1ecddb696bb17b Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期三, 06 十二月 2023 15:12:26 +0800
Subject: [PATCH] 修改
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java
index 65f34a9..b1138ac 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java
@@ -3,6 +3,8 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -10,12 +12,21 @@
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.oss.entity.SynchronousRequest;
+import org.dromara.common.oss.entity.VideoRequest;
import org.dromara.common.redis.utils.QueueUtils;
+import org.dromara.system.domain.properties.Boundary;
+import org.dromara.system.domain.vo.SysOssUploadVo;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.service.ISysOssService;
+import org.dromara.system.uitil.HttpUtils;
+import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -27,15 +38,16 @@
@RequestMapping("/resource/synchronization")
public class SynchronizationController {
+
private final ISysOssService ossService;
/**
- * 涓婁紶鍚屾
+ * 涓婁紶鍚屾 瑙嗛涓撶綉
* @param
* @return
*/
@PostMapping(value = "/upload")
- public R synchronization(SynchronousRequest request) {
+ public R synchronization(SynchronousRequest request) throws ParseException {
if (ObjectUtil.isNull(request.getFile())) {
return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
@@ -46,6 +58,24 @@
QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 1, TimeUnit.HOURS);
log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", "OSS", oss.getOssId());
return R.ok();
+ }
+
+ @PostMapping(value = "/uploadTwo")
+ public R uploadTwo(VideoRequest request1) throws IOException {
+ if (ObjectUtil.isNull(request1.getFile())) {
+ return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+ }
+ SysOssVo oss = ossService.upload3(request1);
+
+ //娣诲姞闃熷垪鏁版嵁
+ QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 1, TimeUnit.DAYS);
+ 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);
}
/**
@@ -68,4 +98,5 @@
return longArray;
}
+
}
--
Gitblit v1.8.0