场景保存接口增加字段

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

@@ -158,11 +158,11 @@ public class SceneDownloadHandlerServiceImpl {
                 imagesVersion = getInfoJson.getInt("imagesVersion");
             }
 
-            //固定文件写入
-            count = this.zipLocalFiles(out, v3localFilePaths, v3localPath, num, count, total);
-
-            //oss文件写入
-            count = this.zipOssFiles(out, ossFilePaths, num, count, total, resolution, imagesVersion, cacheKeys);
+//            //固定文件写入
+//            count = this.zipLocalFiles(out, v3localFilePaths, v3localPath, num, count, total);
+//
+//            //oss文件写入
+//            count = this.zipOssFiles(out, ossFilePaths, num, count, total, resolution, imagesVersion, cacheKeys);
 
             //写入启动命令
             this.zipBat(out, num);

4dkankan-center-scene-download/src/main/resources/bootstrap.yml

@@ -38,7 +38,7 @@ download:
     public-url: https://4dkk.4dage.com/
     resource-url: https://4dkankan.oss-cn-shenzhen.aliyuncs.com/
     exe-name: start-browser.bat
-    exe-content: taskkill /f /t /im http.exe\r\nstart http://127.0.0.1:9000/spc.html?m=%s\r\nhttp.exe -nc -p 9000 -r wwwroot
+    exe-content: taskkill /f /t /im http.exe \\r\\n start http://127.0.0.1:9000/spc.html?m=%s \\r\\n http.exe -nc -p 9000 -r wwwroot
 
 
 

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

@@ -127,4 +127,14 @@ public class SceneJsonBean {
      */
     private String entry;
 
+    /**
+     * 全景图加载方式，tiles/1k：1k瓦片图，tiles/2：2k瓦片图，tiles/4k：4k瓦片图，pan：全景图 ，local：本地切片，cube：立体图
+     */
+    private String sceneResolution;
+
+    /**
+     * 场景来源，lite：双目lite相机，pro：八目相机，minion：双面转台相机，laser：激光相机，virtual：虚拟场景，sketch：图片建模场景
+     */
+    private String sceneFrom;
+
 }

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

@@ -180,6 +180,9 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         }
         sceneJson.setCreateTime(scenePro.getCreateTime());
 
+        sceneJson.setSceneResolution(sceneProExt.getSceneResolution());
+        sceneJson.setSceneFrom(sceneProExt.getSceneFrom());
+
         //处理热点数据，生成hot.json
         this.publicHotData(sceneNum, sceneJson, sceneEditInfo);
 
@@ -311,6 +314,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         if(Objects.isNull(scenePro)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
+        SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
+
         SceneEditInfo sceneEditInfo = this.getBySceneProId(scenePro.getId());
         SceneEditControls sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfo.getId());
         SceneInfoVO sceneInfoVO = BeanUtil.copyProperties(sceneEditInfo, SceneInfoVO.class);
@@ -322,6 +327,9 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         }
         sceneInfoVO.setCreateTime(scenePro.getCreateTime());
 
+        sceneInfoVO.setSceneResolution(sceneProExt.getSceneResolution());
+        sceneInfoVO.setSceneFrom(sceneProExt.getSceneFrom());
+
         return sceneInfoVO;
     }
 

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

@@ -112,6 +112,16 @@ public class SceneInfoVO {
      */
     private String entry;
 
+    /**
+     * 全景图加载方式，tiles/1k：1k瓦片图，tiles/2：2k瓦片图，tiles/4k：4k瓦片图，pan：全景图 ，local：本地切片，cube：立体图
+     */
+    private String sceneResolution;
+
+    /**
+     * 场景来源，lite：双目lite相机，pro：八目相机，minion：双面转台相机，laser：激光相机，virtual：虚拟场景，sketch：图片建模场景
+     */
+    private String sceneFrom;
+