1

src/main/java/com/fdkankan/fusion/service/impl/CaseVideoServiceImpl.java

@@ -105,6 +105,7 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                 List<CaseVideo> videoList = new ArrayList<>();
                 Integer sort = 1;
                 LinkedHashSet<String> filePathSet = new LinkedHashSet<>();
+                LinkedHashSet<String> filePathSetAll = new LinkedHashSet<>();
                 for (MultipartFile file : files) {
                     String ossPath = uploadService.uploadFile(file, true, String.format(FilePath.VIDEO_OSS_PATH,videoFolder.getVideoFolderId())+"/",filePathSet);
                     String suffixName = ossPath.substring(ossPath.lastIndexOf("."));
@@ -125,9 +126,10 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
 
                 redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"20");
                 if(StringUtils.isNotBlank(mergeVideoUrl)){
-                    filePathSet.add(mergeVideoUrl);
+                    filePathSetAll.add(mergeVideoUrl);
                 }
-                String mergeLocalName = VideoUtil.mergeVideo(filePathSet, FilePath.VIDEO_LOCAL_PATH);
+                filePathSetAll.addAll(filePathSet);
+                String mergeLocalName = VideoUtil.mergeVideo(filePathSetAll, FilePath.VIDEO_LOCAL_PATH);
                 redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"30");
                 if(mergeLocalName == null){
                     updateCaseVideoStatus(videoFolder.getVideoFolderId(),-1);