Browse Source

fix bug:修复自测断点续传功能的bug

lijie 3 years ago
parent
commit
1ee117dce9

+ 2 - 1
dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/controller/CompatibleOldFileController.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.persagy.dmp.common.utils.ResourceUtil;
 import com.persagy.dmp.file.constant.FileCommonConst;
 import com.persagy.dmp.file.context.OldFileAppContext;
@@ -336,7 +337,7 @@ public class CompatibleOldFileController {
             FileMd5 fileMd5Create = FileMd5Creator.of(fileInfo.getCreator(), md5, FileCommonConst.UPLOAD_PART);
             fileMd5Create.setFileSize(totalSize);
             fileMd5Create.setCreator(fileInfo.getCreator());
-            fileMd5Service.save(fileMd5);
+            fileMd5Service.save(fileMd5Create);
         }
         Map<Integer,String> okChunkMap = service.mapChunkObjectNames(service.getChuckBucketName(null), md5);
         jsonObj.put("TotalCount", okChunkMap.size());

+ 2 - 0
dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/handler/OldFileContextHandler.java

@@ -3,6 +3,7 @@ package com.persagy.dmp.file.handler;
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.file.context.OldFileAppContext;
 import com.persagy.dmp.file.context.OldFileContext;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -23,6 +24,7 @@ public class OldFileContextHandler implements HandlerInterceptor {
         context.setWorkOrderId(request.getParameter(OldFileContext.WORK_ORDER_ID));
         context.setProjectId(request.getParameter(OldFileContext.PROJECT_ID));
         context.setOverwrite(BooleanUtil.toBoolean(request.getParameter(OldFileContext.OVERWRITE)));
+        AppContext.getContext().setAccountId(request.getParameter(OldFileContext.SYSTEM_ID));
         return true;
     }
 

+ 1 - 1
dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/service/impl/CompatibleOldFileServiceImpl.java

@@ -256,7 +256,7 @@ public class CompatibleOldFileServiceImpl implements CompatibleOldFileService {
         fileInfo.setCreator(OldFileAppContext.getContext().getSystemId());
         fileInfo.setId(OldFileAppContext.getContext().getKey());
         fileService.save(fileInfo);
-        return fileInfo.getFileMd5();
+        return fileInfo.getBusinessId();
     }
 
     /***