修改

qirong

2023-11-22 c738530fb3890f50b788375ec5a81b8f03242cc6

 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对象存储列表
     */
@@ -74,10 +85,19 @@
            return R.fail("上传文件不能为空");
        }
        SysOssVo oss = ossService.upload(file);
        SynchronousRequest request = new SynchronousRequest();
        request.setFile(file);



        //添加队列数据
        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);
    }

@@ -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,53 @@
     */
    @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) {
        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("操作成功");
    }

    /**
     * 同步
     * @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();
    }
}