111

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -416,6 +416,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+        Scene scene = sceneService.getBySceneCode(num);
+        String mappping = scene.getMapping();
 
         SceneEditInfo sceneEditInfo = this.getByScenePlusId(scenePlus.getId());
         if(Objects.isNull(sceneEditInfo)){
@@ -448,6 +450,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         sceneInfoVO.setSpace(FileSizeUtil.convert(scenePlusExt.getSpace(), FileSizeUnitType.MB.code()));
         sceneInfoVO.setSns(JSON.parseObject(sceneEditInfoExt.getSnsInfo()));
 
+        sceneInfoVO.setBucket(mappping);
+
         this.SortBoxVideos(sceneInfoVO);
 
         return sceneInfoVO;
@@ -1534,7 +1538,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             log.info("球幕视频名称：{}", videoName);
             ossUtil.uploadFile(bucket,videosViewPath + videoName, target + File.separator + "extras/video/" + videoName, false);
 
-            CreateObjUtil.mp4ToFlv(target + File.separator + "extras/video/" + videoName,
+            MergeVideoUtil.ffmpegFormatFlv(target + File.separator + "extras/video/" + videoName,
                 target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"));
 
             ossUtil.uploadFile(bucket,videosViewPath + videoName.replace("mp4", "flv"), target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"), false);

src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -244,5 +244,7 @@ public class SceneInfoVO {
      */
     private Integer billboards;
 
+    private String bucket;
+
 
 }