1

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

@@ -118,13 +118,16 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                 try {
                     LinkedHashSet<String> filePathSetAll = new LinkedHashSet<>();
                     String mergeVideoUrl = null;
+                    LinkedHashSet<String> ossDelList = new LinkedHashSet<>();
+
                     if (StringUtils.isNotBlank(videoFolder.getVideoMergeUrl())) {
                         mergeVideoUrl = videoFolder.getVideoMergeUrl().replace(queryPath, "/home/");
                         uploadToOssUtil.downFormAli(videoFolder.getVideoMergeUrl().replace(queryPath, ""), mergeVideoUrl);
-                        uploadService.deleteOssUrl(videoFolder.getVideoMergeUrl());
+                        ossDelList.add(videoFolder.getVideoMergeUrl());
+
                     }
                     if (StringUtils.isNotBlank(videoFolder.getVideoFolderCover())) {
-                        uploadService.deleteOssUrl(videoFolder.getVideoFolderCover());
+                        ossDelList.add(videoFolder.getVideoFolderCover());
                     }
                     caseVideoService.deleteByFolderId(videoFolder.getVideoFolderId());
                     redisUtil.set(RedisKeyUtil.mergerVideoKey + videoFolder.getVideoFolderId(), "10");
@@ -160,6 +163,11 @@ public class CaseVideoServiceImpl extends ServiceImpl<ICaseVideoMapper, CaseVide
                     videoFolderService.updateById(videoFolder);
                     FileUtil.del(FilePath.VIDEO_LOCAL_PATH);
                     updateCaseVideoStatus(videoFolder.getVideoFolderId(), 1);
+
+                    //删除oss原资源
+                    for (String path : ossDelList) {
+                        uploadService.deleteOssUrl(path);
+                    }
                     redisUtil.set(RedisKeyUtil.mergerVideoKey + videoFolder.getVideoFolderId(), "100");
                 }catch (Exception e){
                     updateCaseVideoStatus(videoFolder.getVideoFolderId(), -1);