|
@@ -147,12 +147,14 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
if(sceneEditInfo == null){
|
|
|
sceneEditInfo = new SceneEditInfo();
|
|
|
sceneEditInfo.setSceneProId(scenePro.getId());
|
|
|
-
|
|
|
- sceneEditControls = new SceneEditControls();
|
|
|
}else{
|
|
|
sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfo.getId());
|
|
|
}
|
|
|
|
|
|
+// if(sceneEditControls == null){
|
|
|
+// sceneEditControls = new SceneEditControls();
|
|
|
+// }
|
|
|
+
|
|
|
//生成sceneJson
|
|
|
SceneJsonBean sceneJson = BeanUtil.copyProperties(sceneEditInfo, SceneJsonBean.class);
|
|
|
SceneEditControlsVO sceneEditControlsVO = BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class);
|
|
@@ -192,11 +194,13 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
}else{
|
|
|
this.updateById(sceneEditInfo);
|
|
|
}
|
|
|
- if(sceneEditControls.getId() == null){
|
|
|
- sceneEditControlsService.save(sceneEditControls);
|
|
|
- }else{
|
|
|
- sceneEditControlsService.updateById(sceneEditControls);
|
|
|
- }
|
|
|
+
|
|
|
+// sceneEditControls.setEditInfoId(sceneEditInfo.getId());
|
|
|
+// if(sceneEditControls.getId() == null){
|
|
|
+// sceneEditControlsService.save(sceneEditControls);
|
|
|
+// }else{
|
|
|
+// sceneEditControlsService.updateById(sceneEditControls);
|
|
|
+// }
|
|
|
|
|
|
return ResultData.ok();
|
|
|
}
|
|
@@ -220,6 +224,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
|
|
|
String userEditPath = String.format(UploadFilePath.USER_EDIT_PATH, num);
|
|
|
for(String videoName : video.list()){
|
|
|
+ log.info("球幕视频名称:{}", videoName);
|
|
|
uploadToOssUtil.upload(target + File.separator + "extras/video/" + videoName,userEditPath + videoName);
|
|
|
|
|
|
CreateObjUtil.mp4ToFlv(target + File.separator + "extras/video/" + videoName,
|