1

src/main/java/com/fdkankan/fusion/controller/CaseVideoController.java

@@ -43,8 +43,7 @@ public class CaseVideoController {
     public ResultData uploadAddVideo(@RequestParam(required = false) MultipartFile[] files,
                                      @RequestParam(required = false) Integer folderId,
                                      @RequestParam(required = false) Integer caseId) throws Exception {
-        caseVideoService.uploadAddVideo(files,folderId,caseId);
-        return ResultData.ok();
+        return ResultData.ok( caseVideoService.uploadAddVideo(files,folderId,caseId));
     }
     /**
      * 批量添加文件至文件夹

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

@@ -58,6 +58,11 @@ public class CaseVideoFolder implements Serializable {
      */
     @TableField("sort")
     private Integer sort;
+    /**
+     * 0上传中，-1上传失败，1上传成功
+     */
+    @TableField("upload_status")
+    private Integer uploadStatus;
 
     @TableField("tb_status")
     @TableLogic

src/main/java/com/fdkankan/fusion/service/ICaseVideoService.java

@@ -2,6 +2,7 @@ package com.fdkankan.fusion.service;
 
 import com.fdkankan.fusion.entity.CaseVideo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.fusion.entity.CaseVideoFolder;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -23,7 +24,7 @@ public interface ICaseVideoService extends IService<CaseVideo> {
 
     void delete(Integer videoId);
 
-    void uploadAddVideo(MultipartFile[] files, Integer folderId,Integer caseId) throws IOException;
+    CaseVideoFolder uploadAddVideo(MultipartFile[] files, Integer folderId, Integer caseId) throws IOException;
 
     String uploadAddVideoProgress(Integer folderId);
 }

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

@@ -67,7 +67,7 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
     }
 
     @Override
-    public void uploadAddVideo(MultipartFile[] files, Integer folderId,Integer caseId) throws IOException {
+    public CaseVideoFolder uploadAddVideo(MultipartFile[] files, Integer folderId,Integer caseId) throws IOException {
         if(files.length <=0 || caseId == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
@@ -84,7 +84,7 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
         this.deleteByFolderId(folderId);
         redisUtil.set(RedisKeyUtil.mergerVideoKey+videoFolder.getVideoFolderId(),"10");
         runThread(files,videoFolder,this);
-
+        return videoFolder;
     }
 
     private void runThread(MultipartFile[] files,CaseVideoFolder videoFolder,ICaseVideoService caseVideoService){
@@ -158,6 +158,10 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
         wrapper.in(CaseVideo::getFolderId,folderId)
                 .set(CaseVideo::getUploadStatus,status);
         this.update(wrapper);
+        LambdaUpdateWrapper<CaseVideoFolder> wrapperFolder = new LambdaUpdateWrapper<>();
+        wrapperFolder.eq(CaseVideoFolder::getVideoFolderId,folderId)
+                .set(CaseVideoFolder::getUploadStatus,status);
+        this.update(wrapper);
     }
 
     @Override

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

@@ -54,7 +54,7 @@ public class UploadService {
             if(filePathSet !=null){
                 filePathSet.add(path);
             }
-            if(file.getName().toLowerCase().endsWith(".mp4")){
+            if(fileName.toLowerCase().endsWith(".mp4")){
                 VideoUtil.ffmpegVideo(path,path.replace(suffixName,".jpg"),"200","200");
                 uploadToOssUtil.upload(path.replace(suffixName,".jpg"),filePathAdd+ fileName + ".jpg");
                 if(!uploadToOssUtil.existKey(filePathAdd+ fileName + ".jpg")){