合并

qirong

2023-12-04 f4ba01314a5e2780d5108d4bf59a23cbbeb4d5c8

合并

 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("上传文件不能为空");
        }

 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java

@@ -11,6 +11,7 @@

import java.io.File;
import java.io.IOException;
import java.text.ParseException;
import java.util.Collection;
import java.util.List;

@@ -29,7 +30,7 @@

    SysOssVo upload(MultipartFile file) throws IOException;

    SysOssVo upload2(SynchronousRequest request);
    SysOssVo upload2(SynchronousRequest request) throws ParseException;

//    SysOssVo upload(File file);


 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java

@@ -47,6 +47,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -164,7 +165,7 @@
     * @return
     */
    @Override
    public SysOssVo upload2(SynchronousRequest request) {
    public SysOssVo upload2(SynchronousRequest request) throws ParseException {
        String originalfileName = request.getFile().getOriginalFilename();
        String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
        OssClient storage = OssFactory.instance();
@@ -176,7 +177,7 @@
        }
        // 保存文件信息
        return buildResultEntity2(originalfileName, suffix, storage.getConfigKey(), uploadResult,request.getOssId(),
            request.getPassword(), request.getCreateBy(), request.getFileName());
            request.getPassword(), request.getCreateBy(), request.getFileName(), request.getCreateTime());
    }

//    @Override
@@ -210,7 +211,7 @@
        request.setCreateBy(String.valueOf(oss.getCreateBy()));
//        request.setOssId(String.valueOf(oss.getOssId()));
        request.setOssId("12312312");
//        post(request);
        post(request);

        SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
        return this.matchingUrl(sysOssVo);
@@ -231,8 +232,9 @@
    @NotNull
    private SysOssVo buildResultEntity2(String originalfileName, String suffix, String configKey,
                                        UploadResult uploadResult, String ossId, String password,
                                         String createBy, String fileName) {
                                         String createBy, String fileName, String createTime) throws ParseException {
        SysOss oss = new SysOss();
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        oss.setOssId(Long.valueOf(ossId));
        oss.setUrl(uploadResult.getUrl());
        oss.setFileSuffix(suffix);
@@ -242,6 +244,7 @@
        oss.setPassword(password);
        oss.setCreateTime(new Date());
        oss.setCreateBy(Long.valueOf(createBy));
        oss.setCreateTime(format.parse(createTime));
        baseMapper.insert(oss);
        SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
        return this.matchingUrl(sysOssVo);
@@ -258,7 +261,7 @@
            storage.delete(sysOss.getUrl());
            if(sysOss.getPassword().equals(password) || password.equals("000000")){
                baseMapper.deleteById(sysOss.getOssId());
//                HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
                HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
                return true;
            }
            return false;

 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java

@@ -139,8 +139,8 @@
        builder.addTextBody("ossId", entity.getOssId(), ContentType.TEXT_PLAIN);
        builder.addTextBody("createBy", entity.getCreateBy(), ContentType.TEXT_PLAIN);
        builder.addTextBody("password", entity.getPassword(), ContentType.TEXT_PLAIN);
        builder.addTextBody("fileName", entity.getFileName(),contentType);
//        builder.addTextBody("createTime", entity.getCreateTime(),);
        builder.addTextBody("fileName", entity.getFileName(), contentType);
        builder.addTextBody("createTime", entity.getCreateTime(), ContentType.TEXT_PLAIN);

        HttpEntity multipart = builder.build();
        httpPost.setEntity(multipart);