Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java

@@ -1618,9 +1618,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 
     @Override
     public Result<?> importSplitResult(String splitFileId, String cut, SarFileSplitInfoEO sarFileSplitInfoEO) throws IOException {
-        OSSFile ossFile = ossFileService.getById(splitFileId);
-        String url = ossFile.getUrl();
-        MultipartFile mFile = createMfileByPath(url);
+
+//        MultipartFile mFile = createMfileByPath(url);
 
         // 新增拆分记录
         Date now = new Date();
@@ -1644,7 +1643,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO);
 
         // 导入文件
+        OSSFile ossFile = ossFileService.getById(splitFileId);
+        String url = ossFile.getUrl();
+        if (!CosBootUtil.doesObjectExist(url)) {
+            if (CutEnum.CN.getValue().equals(cut)) {
+                throw new JeroBootException("导入的压缩包不存在！");
+            } else {
+                throw new JeroBootException("Importing a compressed package that does not exist!");
+            }
+        }
+        InputStream inputStream = CosBootUtil.download(url);
+        String fileName = url.substring((url.lastIndexOf("/") + 1));
+        MultipartFile mFile = new MockMultipartFile(fileName, fileName, ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);
         Result<?> result = importSplitItems(mFile, cut, menuId, infoId);
+
         if(!result.isSuccess()){
             sarFileSplitInfoService.deleteById(infoId);
         }