소스 검색

fix bug:修复合并文件接口的bug

lijie 3 년 전
부모
커밋
291a292578

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

@@ -101,7 +101,8 @@ public class FileUploadServiceImpl extends ServiceImpl<FileMapper, FileInfo> imp
     @Override
     public FileInfo composeFile(FileRequestData requestData) {
         //根据md5获取所有分片文件名称(minio的文件名称 = 文件path)
-        List<String> chunks = minioCommonService.listObjectNames("chunk",requestData.getFileMd5());
+        List<String> chunks = minioCommonService
+                .listObjectNames(minioCommonService.getChuckBucketName(null),requestData.getFileMd5());
         //自定义文件名称
         String fileName = requestData.getFileName();
         String suffix = fileName.substring(fileName.lastIndexOf("."));

+ 1 - 1
dmp-cloud/dmp-file/src/main/resources/db/init/schema.sql

@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `dt_file_info` (
 `creation_time` char(14) NULL DEFAULT NULL COMMENT '创建时间',
 `modifier` varchar(32) DEFAULT NULL COMMENT '最后修改人',
 `modified_time` char(14) NULL DEFAULT NULL COMMENT '最后修改时间',
-`valid` tinyint DEFAULT NULL COMMENT '合法标识',
+`valid` tinyint DEFAULT 1 COMMENT '合法标识',
 `ts` timestamp default current_timestamp on update current_timestamp NOT NULL COMMENT '乐观锁',
 PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='文件信息';

+ 9 - 0
dmp-comp/dmp-file-starter/src/main/java/com/persagy/dmp/storage/service/MinioCommonService.java

@@ -159,4 +159,13 @@ public interface MinioCommonService {
      * Update By lijie 2021/10/16 14:51
      */
     boolean composeObject(String bucketName, List<String> chunkNames, String objectName);
+    /***
+     * Description: 获取chuck的bucketName
+     * @param bucketName : 传入的bucketName
+     * @return : java.lang.String
+     * @author : lijie
+     * @date :2021/10/21 10:39
+     * Update By lijie 2021/10/21 10:39
+     */
+    String getChuckBucketName(String bucketName);
 }

+ 15 - 0
dmp-comp/dmp-file-starter/src/main/java/com/persagy/dmp/storage/service/impl/MinioCommonServiceImpl.java

@@ -337,6 +337,21 @@ public class MinioCommonServiceImpl implements MinioCommonService, InitializingB
         }
         return expiry;
     }
+    /***
+     * Description: 获取chuck的bucketName
+     * @param bucketName : 传入的bucketName
+     * @return : java.lang.String
+     * @author : lijie
+     * @date :2021/10/21 10:39
+     * Update By lijie 2021/10/21 10:39
+     */
+    @Override
+    public String getChuckBucketName(String bucketName){
+        if (StrUtil.isNotBlank(bucketName)){
+            return bucketName;
+        }
+        return chunkBucKet;
+    }
 
 
 }