getinfo接口返回videos字段，去掉cadInfo;isUploadObj;floorEditVer;floorPublishVer;字段

4dkankan-center-scene/src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java

@@ -100,27 +100,27 @@ public class SceneJsonBean {
      */
     private Byte floorPlanUser;
 
-    private String cadInfo;
+//    private String cadInfo;
 
     /**
      * 是否有热点
      */
     private Byte tags;
 
-    /**
-     * 是否上传模型
-     */
-    private Byte isUploadObj;
-
-    /**
-     * 重新建模的版本
-     */
-    private Integer floorEditVer;
-
-    /**
-     * 正式发布重新建模的版本
-     */
-    private Integer floorPublishVer;
+//    /**
+//     * 是否上传模型
+//     */
+//    private Byte isUploadObj;
+//
+//    /**
+//     * 重新建模的版本
+//     */
+//    private Integer floorEditVer;
+//
+//    /**
+//     * 正式发布重新建模的版本
+//     */
+//    private Integer floorPublishVer;
 
     /**
      * 初始点信息
@@ -142,4 +142,9 @@ public class SceneJsonBean {
      */
     private String boxVideos;
 
+    /**
+     *点位视频
+     */
+    private String videos;
+
 }

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

@@ -183,6 +183,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         sceneJson.setSceneResolution(sceneProExt.getSceneResolution());
         sceneJson.setSceneFrom(sceneProExt.getSceneFrom());
+        sceneJson.setVideos(scenePro.getVideos());
 
         //处理热点数据，生成hot.json
         this.publicHotData(sceneNum, sceneJson, sceneEditInfo);
@@ -330,6 +331,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         sceneInfoVO.setSceneResolution(sceneProExt.getSceneResolution());
         sceneInfoVO.setSceneFrom(sceneProExt.getSceneFrom());
+        sceneInfoVO.setVideos(scenePro.getVideos());
 
         return sceneInfoVO;
     }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -4547,6 +4547,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         String newResultData = sceneProExt.getDataSource() + "_obj2txt/results/upload.json";
         String zipName = sceneNum + "_extras.zip";
         String zipPath = localImagePath + zipName;
+        //如果用户上传过模型，就打包上传到oss，直接返回
         if(CommonStatus.YES.code().equals(sceneEditInfo.getIsUploadObj())
             && new File(newData).exists()
             && new File(newResultData).exists()){

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -99,13 +99,13 @@ public class SceneInfoVO {
      */
     private Byte floorPlanUser;
 
-    private String cadInfo;
-
-    private Byte isUploadObj;
-
-    private Integer floorEditVer;
-
-    private Integer floorPublishVer;
+//    private String cadInfo;
+//
+//    private Byte isUploadObj;
+//
+//    private Integer floorEditVer;
+//
+//    private Integer floorPublishVer;
 
     /**
      * 初始点信息
@@ -127,6 +127,11 @@ public class SceneInfoVO {
      */
     private String boxVideos;
 
+    /**
+     *点位视频
+     */
+    private String videos;
+