From f4ba01314a5e2780d5108d4bf59a23cbbeb4d5c8 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期一, 04 十二月 2023 13:45:25 +0800
Subject: [PATCH] 合并
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 ae02446..521af12 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
@@ -16,6 +16,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.text.ParseException;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -35,7 +36,7 @@
* @return
*/
@PostMapping(value = "/upload")
- public R synchronization(SynchronousRequest request) {
+ public R synchronization(SynchronousRequest request) throws ParseException {
if (ObjectUtil.isNull(request.getFile())) {
return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
@@ -51,14 +52,12 @@
/**
* 鍒犻櫎鍚屾
*
- * @param ossIds OSS瀵硅薄ID涓�
+ * @param ossId OSS瀵硅薄ID涓�
*/
- @SaCheckPermission("system:oss:remove")
- @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ossIds}")
- public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable String ossIds) throws Exception {
- return ossService.deleteWithValidByIds(List.of(convert(ossIds)), true,"000000") ? R.ok() : R.fail("鎻愬彇鐮侀敊璇紒");
+ @PostMapping(value = "/delete")
+ public R<Void> remove(String ossId) throws Exception {
+ ossId = "12312312";
+ return ossService.deleteWithValidByIds(List.of(convert(ossId)), true,"000000") ? R.ok() : R.fail("鎻愬彇鐮侀敊璇紒");
}
public static Long[] convert(String input) {
--
Gitblit v1.8.0