1

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

@@ -81,25 +81,26 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
         if(videoFolder == null){
             throw new BusinessException(ResultCode.FOLDER_NOT_EXIST);
         }
-        String mergeVideoUrl = null;
-        if(StringUtils.isNotBlank(videoFolder.getVideoMergeUrl())){
-            uploadService.deleteOssUrl(videoFolder.getVideoMergeUrl());
-            mergeVideoUrl = videoFolder.getVideoMergeUrl().replace(queryPath,"/home/");
-            uploadToOssUtil.downFormAli(videoFolder.getVideoMergeUrl(),mergeVideoUrl);
-        }
-        if(StringUtils.isNotBlank(videoFolder.getVideoMergeUrl())){
-            uploadService.deleteOssUrl(videoFolder.getVideoFolderCover());
-        }
-        this.deleteByFolderId(folderId);
-        redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"10");
-        runThread(mergeVideoUrl,files,videoFolder,this);
+        runThread(files,videoFolder,this);
         return videoFolder;
     }
 
-    private void runThread(String mergeVideoUrl,MultipartFile[] files,CaseVideoFolder videoFolder,ICaseVideoService caseVideoService){
+    private void runThread(MultipartFile[] files,CaseVideoFolder videoFolder,ICaseVideoService caseVideoService){
         new Runnable() {
             @Override
             public void run() {
+                String mergeVideoUrl = null;
+                if(StringUtils.isNotBlank(videoFolder.getVideoMergeUrl())){
+                    uploadService.deleteOssUrl(videoFolder.getVideoMergeUrl());
+                    mergeVideoUrl = videoFolder.getVideoMergeUrl().replace(queryPath,"/home/");
+                    uploadToOssUtil.downFormAli(videoFolder.getVideoMergeUrl(),mergeVideoUrl);
+                }
+                if(StringUtils.isNotBlank(videoFolder.getVideoMergeUrl())){
+                    uploadService.deleteOssUrl(videoFolder.getVideoFolderCover());
+                }
+                caseVideoService.deleteByFolderId(videoFolder.getVideoFolderId());
+                redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"10");
+
                 //替换文件夹中文件
                 List<CaseVideo> videoList = new ArrayList<>();
                 Integer sort = 1;
@@ -121,14 +122,7 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                 if(videoList.size() <=0){
                     return;
                 }
-//                if(videoList.size() ==1){
-//                    updateCaseVideoStatus(videoFolder.getVideoFolderId(),1);
-//                    videoFolder.setVideoMergeUrl(videoList.get(0).getVideoPath());
-//                    videoFolder.setVideoFolderCover(videoList.get(0).getVideoCover());
-//                    videoFolderService.updateById(videoFolder);
-//                    redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"100");
-//                    return;
-//                }
+
                 redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"20");
                 if(StringUtils.isNotBlank(mergeVideoUrl)){
                     filePathSet.add(mergeVideoUrl);