Explorar el Código

Merge branch 'feature-8k-20230818-dsx' into test

dsx hace 2 años
padre
commit
0c6d90e98d

+ 6 - 2
src/main/java/com/fdkankan/openApi/service/www/impl/ScenePlusServiceImpl.java

@@ -131,7 +131,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
         //检测原始图片是否存在
         String ossImagePath = String.format(UploadFilePath.IMG_VIEW_PATH, num);
-        String ossCaptruePath = ossImagePath.concat("capture");
+        String ossCaptruePath = ossImagePath.concat("capture/");
         List<String> captrueList = fYunFileService.listRemoteFiles(ossCaptruePath);
         if(CollUtil.isEmpty(captrueList)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3018.code(), "全景图不能为空");
@@ -148,6 +148,10 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
         JSONObject dataJson = new JSONObject();
         dataJson.put("split_type", "SPLIT_V8");
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("has_vision_txt",true);
+        jsonObject.put("has_source_images",true);
+        dataJson.put("extras", jsonObject);
         //V5表示不需要生成high,low文件
         String skyboxType = "SKYBOX_V6";
         SceneResolution sceneResolution = SceneResolution.get(param.getSceneResolution());
@@ -159,7 +163,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 skyboxType = "SKYBOX_V7";
                 break;
             case four_K:
-                skyboxType = "SKYBOX_V8";
+                skyboxType = "SKYBOX_V6";
         }
         dataJson.put("skybox_type", skyboxType);
         FileUtil.writeUtf8String(dataJson.toJSONString(), target + File.separator+"data.json");