1

src/main/java/com/fdkankan/fusion/entity/CaseVideo.java

@@ -40,6 +40,9 @@ public class CaseVideo implements Serializable {
     @TableField("sort")
     private Integer sort;
 
+    @TableField("upload_status")
+    private Integer uploadStatus;
+
     @TableField("tb_status")
     @TableLogic(value = "0",delval = "1")
     private Integer tbStatus;

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

@@ -3,6 +3,7 @@ package com.fdkankan.fusion.service.impl;
 import cn.hutool.core.io.FileUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.util.RedisKeyUtil;
@@ -113,9 +114,11 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                     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");
@@ -123,6 +126,7 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                 String mergeLocalName = VideoUtil.mergeVideo(filePathSet, FilePath.VIDEO_LOCAL_PATH);
                 redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"30");
                 if(mergeLocalName == null){
+                    updateCaseVideoStatus(videoFolder.getVideoFolderId(),-1);
                     redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"-1");
                     return;
                 }
@@ -134,6 +138,7 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                 uploadToOssUtil.upload(mergeLocalPath,ossKey);
                 uploadToOssUtil.upload(mergeLocalPathImg,ossKeyImg);
                 if(!uploadToOssUtil.existKey(ossKey)&& !uploadToOssUtil.existKey(ossKeyImg)){
+                    updateCaseVideoStatus(videoFolder.getVideoFolderId(),-1);
                     redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"-1");
                     return;
                 }
@@ -144,10 +149,19 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                 videoFolderService.updateById(videoFolder);
                 FileUtil.del(FilePath.VIDEO_LOCAL_PATH);
                 redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"100");
+                updateCaseVideoStatus(videoFolder.getVideoFolderId(),1);
+
             }
         });
     }
 
+    private void updateCaseVideoStatus(Integer folderId, Integer status) {
+        LambdaUpdateWrapper<CaseVideo> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.in(CaseVideo::getFolderId,folderId)
+                .set(CaseVideo::getUploadStatus,status);
+        this.update(wrapper);
+    }
+
     @Override
     public String uploadAddVideoProgress(Integer folderId) {
         String redisKey = RedisKeyUtil.mergerVideoKey+folderId;