Browse Source

场景中心接口变更

dengsixing 3 years ago
parent
commit
a8202c7baa

+ 12 - 7
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -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,

+ 1 - 0
pom.xml

@@ -13,6 +13,7 @@
         <module>4dkankan-center-modeling</module>
         <module>4dkankan-center-statistics</module>
         <module>4dkankan-pay</module>
+      <module>4dkankan-center-scene-download</module>
     </modules>
 
     <parent>