1

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

@@ -81,26 +81,25 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
         if(videoFolder == null){
             throw new BusinessException(ResultCode.FOLDER_NOT_EXIST);
         }
-        runThread(files,videoFolder,this);
+        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);
         return videoFolder;
     }
 
-    private void runThread(MultipartFile[] files,CaseVideoFolder videoFolder,ICaseVideoService caseVideoService){
+    private void runThread(String mergeVideoUrl,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;