修改

qirong

2023-12-06 badc83cad7a47ec00af8a45a3d1ecddb696bb17b

 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java

@@ -4,11 +4,15 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONArray;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
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.oss.entity.VideoRequest;
import org.dromara.common.redis.utils.CacheUtils;
import org.dromara.common.redis.utils.QueueUtils;
import org.dromara.common.web.core.BaseController;
@@ -18,6 +22,7 @@
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.properties.Boundary;
import org.dromara.system.domain.vo.SysOssUploadVo;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.mapper.SysOssMapper;
@@ -25,6 +30,7 @@
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
import org.dromara.system.uitil.HttpUtils;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +38,7 @@

import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;

@@ -48,6 +55,7 @@
@RequestMapping("/resource/oss")
public class SysOssController extends BaseController {

    private final Boundary boundary;
    private final ISysOssService ossService;
    private final SysOssMapper ossMapper;
    /**
@@ -72,33 +80,66 @@
        return R.ok(list);
    }

//    /**
//     * 上传OSS对象存储  视频专网
//     *
//     * @param file 文件
//     */
//    @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) 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(), 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);
//    }

    /**
     * 上传OSS对象存储
     * 上传OSS对象存储  互联网
     *
     * @param file 文件
     */
    @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<String> upload(@RequestPart("file") MultipartFile file) throws IOException {
        if (ObjectUtil.isNull(file)) {
            return R.fail("上传文件不能为空");
        }
        SysOssVo oss = ossService.upload(file);
        SynchronousRequest request = new SynchronousRequest();
        VideoRequest request = new VideoRequest();
        request.setFile(file);
        request.setFileName(file.getOriginalFilename());
        String post = post(request);
        String password = post.substring(post.indexOf("password\":\"") + 9, post.indexOf("\"}"));
        return R.ok(password);
    }



        //添加队列数据
        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);
    private String post(VideoRequest request) throws IOException {
        HashMap<String, String> headers = new HashMap<>(3);
        String requestUrl = boundary.getChief() +  "/resource/synchronization/uploadTwo";
        ObjectMapper objectMapper = new ObjectMapper();
        objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
        headers.put("content-type", "application/json");
        // 发送post请求
        String resultData = HttpUtils.sendPostRequest2(requestUrl, request);
        // 并接收返回结果
        System.out.println(resultData);
        return resultData;
    }

    /**
@@ -127,7 +168,7 @@
    @DeleteMapping("/{ossIds}/{password}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
                          @PathVariable Long[] ossIds,
                          @PathVariable String password) {
                          @PathVariable String password) throws Exception {
        return ossService.deleteWithValidByIds(List.of(ossIds), true,password) ? R.ok() : R.fail("提取码错误！");
    }

@@ -159,18 +200,5 @@
        return R.ok("操作成功");
    }

    /**
     * 同步
     * @param
     * @return
     */
    @PostMapping(value = "/synchronization")
    public R synchronization(SynchronousRequest request) {
        if (ObjectUtil.isNull(request.getFile())) {
            return R.fail("上传文件不能为空");
        }
        log.info("ossId:{},path:{}",request.getOssId(),request.getPath());
        SysOssVo oss = ossService.upload2(request);
        return R.ok();
    }

}