场景关联

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

@@ -4172,7 +4172,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     public ResultData savePanorama(FileParamVO param, MultipartFile file) throws Exception {
         String sceneNum = param.getNum();
         String sid = param.getSid();
-        String imagesName = param.getImagesName();
+        String imagesName = param.getFileName();
         if(StrUtil.isEmpty(sceneNum) || StrUtil.isEmpty(sid)){
             throw new BusinessException(ErrorCode.PARAM_REQUIRED);
         }
@@ -4221,7 +4221,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         visionJson.put("group", 1);
         visionJson.put("subgroup", 0);
         visionArray.add(visionJson);
-
         JSONObject vision = new JSONObject();
         vision.put("sweepLocations", visionArray);
         FileUtils.writeFile(target + "/extras" + File.separator + "vision.txt", new String(vision.toString().getBytes(), "UTF-8"));
@@ -4235,12 +4234,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
             JSONObject dataJson = JSONObject.parseObject(data);
             dataJson.put("extras", floorplanJson);
+            dataJson.put("split_type", "SPLIT_V8");//替换全景图算法
             //V5表示不需要生成high，low文件
-            dataJson.put("skybox_type", "SKYBOX_V6");
+            dataJson.put("skybox_type", "SKYBOX_V6");//默认4k   minion
             if(scenePro.getSceneScheme() == 11){
-                dataJson.put("skybox_type", "SKYBOX_V7");//pro 2k  minion 4k
+                dataJson.put("skybox_type", "SKYBOX_V7");//pro 2k
             }
-            dataJson.put("split_type", "SPLIT_V8");
             if(scenePro.getSceneScheme() == 3){
                 dataJson.put("skybox_type", "SKYBOX_V4");
             }