From d6ef89e201c6ec2ff1f33db78f0833855a6785f2 Mon Sep 17 00:00:00 2001 From: qirong <2032486488@qq.com> Date: 星期三, 22 十一月 2023 17:56:40 +0800 Subject: [PATCH] 修改删除同步 --- ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 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 8a3ffa4..ae02446 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 @@ -1,17 +1,23 @@ package org.dromara.system.controller.system; +import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.util.ObjectUtil; +import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; +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.redis.utils.QueueUtils; import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.service.ISysOssService; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.concurrent.TimeUnit; @Slf4j @SaIgnore @@ -35,6 +41,34 @@ } log.info("ossId:{},path:{}",request.getOssId(),request.getPath()); SysOssVo oss = ossService.upload2(request); + + //娣诲姞闃熷垪鏁版嵁 + QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 1, TimeUnit.HOURS); + log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", "OSS", oss.getOssId()); return R.ok(); } + + /** + * 鍒犻櫎鍚屾 + * + * @param ossIds 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("鎻愬彇鐮侀敊璇紒"); + } + + public static Long[] convert(String input) { + String[] stringArray = input.split(","); + Long[] longArray = new Long[stringArray.length]; + + for (int i = 0; i < stringArray.length; i++) { + longArray[i] = Long.parseLong(stringArray[i].trim()); + } + + return longArray; + } } -- Gitblit v1.8.0