Sfoglia il codice sorgente

fix bug:
1.初始化数据不成功的问题
2.获得文件上传信息接口,同一MD5第二次请求initSingleUpload接口,返回数据里 没有uploadUrl文件上传链接

lijie 3 anni fa
parent
commit
adee41c2df

+ 1 - 1
dmp-business/dmp-dic/src/main/resources/db/init/data.sql

@@ -18,7 +18,7 @@ replace into `dic_dt_type` ( `id`, `description`, `valid`, `modified_time`, `typ
 -- ----------------------------
 --  Data for `dic_dt_data`
 -- ----------------------------
-replace into `dic_dt_data` ( `id`, `dict_type_id`, `parent_id`, `type`, `code`, `label`, `type`, `valid`, `creator`, `creation_time`, `modifier`, `modified_time`, `remark`, `order_num`,`ts`) values
+replace into `dic_dt_data` ( `id`, `dict_type_id`, `parent_id`, `type`, `code`, `label`, `valid`, `creator`, `creation_time`, `modifier`, `modified_time`, `remark`, `order_num`,`ts`) values
  ('0377f724-9a3f-1d9a-7d44-381b2a19019a', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', '', 'alarm_category', 'CS', '冷站能效报警', 1, NULL, NULL, NULL, NULL, '', 0, '2021-08-09 09:50:13' ),
  ('040d7cbd-4c44-42ff-baa1-c323ee53f0b1', '7781b335-129b-443b-a6e7-e360b14cde3b', '', 'alarm_treat_state', '3', '处理完成', 1, NULL, NULL, NULL, NULL, '', 0, '2021-08-09 09:50:13' ),
  ('0533f62c-7cd2-4739-9343-d86c2df7d695', '7781b335-129b-443b-a6e7-e360b14cde3b', '', 'alarm_treat_state', '2', '处理中', 1, NULL, NULL, NULL, NULL, '', 0, '2021-08-09 09:50:13' ),

+ 7 - 3
dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/service/impl/FileServiceImpl.java

@@ -102,7 +102,8 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, FileInfo> implement
         FileMd5 fileMd5 = fileMd5Service.queryFileMd5ByFileMd5(requestData.getFileMd5());
         // 2.历史已上传且已完成上传
         if (ObjectUtil.isNotNull(fileMd5)
-                && FileCommonConst.UPLOAD_SUCCESS.equals(fileMd5.getUploadStatus())){
+                && FileCommonConst.UPLOAD_SUCCESS.equals(fileMd5.getUploadStatus())
+                && service.exists(fileMd5.getFileBucket(),fileMd5.getFilePath())){
             // 秒传
             return secondTransmission(requestData.getFileName(),requestData.getGroupCode(),
                     requestData.getBusinessId(),requestData.getExpireDate(),fileMd5.getFileMd5(),requestData.getFileId());
@@ -202,7 +203,8 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, FileInfo> implement
         }
         // 3.历史已上传且已完成上传
         if (ObjectUtil.isNotNull(fileMd5)
-                && FileCommonConst.UPLOAD_SUCCESS.equals(fileMd5.getUploadStatus())){
+                && FileCommonConst.UPLOAD_SUCCESS.equals(fileMd5.getUploadStatus())
+                && service.exists(fileMd5.getFileBucket(),fileMd5.getFilePath())){
             // 秒传
             return secondTransmission(requestData.getFileName(),requestData.getGroupCode(),
                     requestData.getBusinessId(),requestData.getExpireDate(),fileMd5.getFileMd5(),requestData.getFileId());
@@ -228,6 +230,7 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, FileInfo> implement
         uploadMes.setContent(CollUtil.newArrayList(uploadSubMes));
         return uploadMes;
     }
+
     /***
      * Description: 根据Md5查询文件信息
      * @param fileMd5 : 文件md5值
@@ -254,7 +257,8 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, FileInfo> implement
     @Override
     public FileInfo initFileDownload(FileRequestData requestData) {
         FileInfo fileInfo = fileMapper.getFileInfoById(requestData.getFileId());
-        if (null==fileInfo){
+        IFileStorageService service = FileStorageFactory.getService();
+        if (null==fileInfo || !service.exists(fileInfo.getFileBucket(),fileInfo.getFilePath())){
             throw new BusinessException("文件不存在");
         }
         String fetchUrl = FileStorageFactory.getService().fetchUrl(fileInfo.getFileBucket(), fileInfo.getFilePath());