获得专利附图的guid

src/main/java/com/example/fms/common/model/dto/UploadChuckDTO.java

@@ -10,4 +10,5 @@ public class UploadChuckDTO {
     private Integer totalNum;
     private String md5;
     private Integer sourceId;
+    private Long time;
 }

src/main/java/com/example/fms/common/utils/Md5Util.java

@@ -0,0 +1,12 @@
+package com.example.fms.common.utils;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class Md5Util {
+    public static String getTimeMd5(String md5,Long time){
+        String reMd5 =md5+"-"+time;
+        return reMd5;
+
+    }
+}

src/main/java/com/example/fms/controller/FileMangerController.java

@@ -198,15 +198,15 @@ public class FileMangerController {
 
     @PostMapping("/chunks")
     @Operation(summary = "上传分片")
-    public String uploadChunks(MultipartFile file, String md5, Integer index) throws Exception {
-       fileManagerService.uploadChunks(file,md5,index);
+    public String uploadChunks(MultipartFile file, String md5, Integer index,Long time) throws Exception {
+       fileManagerService.uploadChunks(file,md5,index,time);
         return Response.success(true);
     }
 
     @PostMapping("/merge")
     @Operation(summary = "合并分片")
-    public String uploadChunksMerge(String md5, String fileName)  throws Exception{
-     List<String> GUIDs= fileManagerService.uploadChunksMerge(md5);
+    public String uploadChunksMerge(String md5, String fileName,Long time)  throws Exception{
+     List<String> GUIDs= fileManagerService.uploadChunksMerge(md5,time);
         if(GUIDs != null && GUIDs.size() != 0){
             return Response.success(GUIDs);
         } else {

src/main/java/com/example/fms/service/FileChuckService.java

@@ -7,10 +7,7 @@ import com.example.fms.common.core.base.RedisConf;
 import com.example.fms.common.model.dto.UploadChuckDTO;
 import com.example.fms.common.model.vo.ConfigSettingVO;
 import com.example.fms.common.model.vo.UploadChuckVO;
-import com.example.fms.common.utils.ExcuteConfigUtils;
-import com.example.fms.common.utils.FileUtils;
-import com.example.fms.common.utils.JsonUtils;
-import com.example.fms.common.utils.RedisUtil;
+import com.example.fms.common.utils.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -22,10 +19,12 @@ public class FileChuckService {
     private final RedisUtil redisUtil;
 
     public Boolean startChunks(UploadChuckDTO uploadChuckDTO) {
-        String md5 = uploadChuckDTO.getMd5();
-        if (md5 == null) {
+        String orMd5 = uploadChuckDTO.getMd5();
+        Long time =uploadChuckDTO.getTime();
+        if (orMd5 == null||time==null) {
             return false;
         }
+        String md5 = Md5Util.getTimeMd5(orMd5,time);
         UploadChuckVO uploadChuckVO = new UploadChuckVO();
         uploadChuckVO.setOrginName(uploadChuckDTO.getFileName());
         String exrName = FileUtil.extName(uploadChuckDTO.getFileName());
@@ -41,7 +40,7 @@ public class FileChuckService {
         String filePath = FileUtils.getDateFilePath(configSettingVO.getFilePath());
         uploadChuckVO.setFilePath(filePath);
 
-        String key = this.getTemFileMessageKey(uploadChuckDTO.getMd5());
+        String key = this.getTemFileMessageKey(md5);
         String jsons = JSONObject.toJSONString(uploadChuckVO);
         redisUtil.set(key, jsons);
         return true;

src/main/java/com/example/fms/service/FileMangerService.java

@@ -241,8 +241,9 @@ public class FileMangerService {
     }
 
 
-    public void uploadChunks(MultipartFile file, String md5, Integer index) throws Exception {
+    public void uploadChunks(MultipartFile file, String md5, Integer index,Long time) throws Exception {
         //2.根据传入id，获得配置类，根据配置类中的id去匹配sourceId来选择使用的上传方法
+        md5 =Md5Util.getTimeMd5(md5,time);
         String tempPath = fileUtils.getTempPath(md5);
         File tempDirectory = new File(tempPath);
         if (!tempDirectory.exists()) {
@@ -254,8 +255,8 @@ public class FileMangerService {
         ossService.uploadChucks(temFile, index, md5);
     }
 
-    public List<String> uploadChunksMerge(String md5) throws Exception {
-
+    public List<String> uploadChunksMerge(String md5,Long time) throws Exception {
+          md5 =Md5Util.getTimeMd5(md5,time);
         //上传分片
         ossService.uploadChunksMerge(md5);
         //删除分片文件

src/main/java/com/example/fms/service/SftpService.java

@@ -72,7 +72,6 @@ public class SftpService {
         config.put("StrictHostKeyChecking", "no"); // 不验证 HostKey
         session.setConfig(config);
         try {
-            session.connect();
         } catch (Exception e) {
             if (session.isConnected())
                 session.disconnect();

src/main/resources/configSetting.json

@@ -2,7 +2,7 @@
   {
     "sourceId": "1",
     "sourceName": "FSS",
-    "name": "192.168.1.24",
+    "name": "192.168.2.24",
     "id": 1,
     "userName": "root",
     "passWord": "xiaoshi221101",
@@ -38,8 +38,18 @@
   {
     "sourceId": "2",
     "sourceName": "OSS",
+    "id": 5,
+    "endPoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
+    "accessKeyId": "LTAI5tGyG1Q7fKprgg1nWhXj",
+    "accessKeySecret": "Y6Erboh5lEFiRPR4XK8oCPMvUzYGLN",
+    "bucketName": "xiaoshi-pas-syst",
+    "filePath": "project/pas/prod/file/"
+  },
+  {
+    "sourceId": "2",
+    "sourceName": "OSS",
     "id": 6,
-    "endPoint": "https://oss-cn-shanghai.aliyuncs.com",
+    "endPoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
     "accessKeyId": "LTAI5tGyG1Q7fKprgg1nWhXj",
     "accessKeySecret": "Y6Erboh5lEFiRPR4XK8oCPMvUzYGLN",
     "bucketName": "xiaoshi-pas-syst",