大理公安

src/main/java/com/fdkankan/contro/controller/SceneFileController.java

@@ -78,7 +78,7 @@ public class SceneFileController{
      */
     @PostMapping("turntableUploadSuccess")
     public ResultData turntableUploadSuccess(String params) throws Exception {
-        return sceneFileBuildService.turntableUploadSuccess(params, null, false, true, null);
+        return sceneFileBuildService.turntableUploadSuccess(params, null, false, true);
     }
 
     /**

src/main/java/com/fdkankan/contro/mq/listener/UploadSceneListener.java

@@ -147,6 +147,9 @@ public class UploadSceneListener {
         String fileId = sceneFileBuildService.getFileId(snCode, uniCode);
         String homePath = ConstantFilePath.OSS_PREFIX + snCode + File.separator + fileId + File.separator + uniCode + File.separator;
         String fileDir = sourcePath + File.separator + uniCode;//本地版压缩包包含了一层unicode目录
+        //往data.fdage中写入生成3dgs标识，场景重算时用到，大理这个版本设计不完善，暂时这样做
+        dataFdageObj.put("genGs", genGs);
+        FileUtil.writeUtf8String(dataFdageObj.toJSONString(), dataFdageFile.getAbsoluteFile());
         fYunFileService.uploadFileByCommand(fileDir, homePath);
 //        String cpCmd = "cp -p -r " + fileDir + "/* " + homePath;
 //        CmdUtils.callLineSh(cpCmd);
@@ -156,7 +159,7 @@ public class UploadSceneListener {
         String params = snCode + "#" + fileId + "#" + uniCode;
         String encode = Base64.encode(RSAEncrypt.encrypt(RSAEncrypt.loadPublicKeyByStr(RSAEncrypt.loadPublicKeyByFile()), params.getBytes(StandardCharsets.UTF_8)));
         if(camType == 9 || camType == 10 || camType == 11 || camType == 12){
-            sceneFileBuildService.turntableUploadSuccess(encode, user, true, false, genGs);
+            sceneFileBuildService.turntableUploadSuccess(encode, user, true, false);
         }else{
             sceneFileBuildService.uploadSuccessBuild(encode, user, true, false);
         }

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -206,7 +206,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 if(genGs != null && genGs == CommonStatus.YES.code().intValue()){
                     dataMap = new HashMap<>();
                     dataMap.put("splitType", "SPLIT_V34");
-                    dataMap.put("skyboxType", "SPLIT_V15");
+                    dataMap.put("skyboxType", "SKYBOX_V15");
                 }
             }
             buildService.writeDataJson(message, fdageJson, dataMap, null);

src/main/java/com/fdkankan/contro/service/ISceneFileBuildService.java

@@ -26,7 +26,7 @@ public interface ISceneFileBuildService extends IService<SceneFileBuild> {
 
     ResultData uploadSuccessBuild(String params, User user, boolean forceBuild, boolean checkUploadFile) throws Exception;
 
-    ResultData turntableUploadSuccess(String params, User user, boolean forceBuild, boolean checkUploadFile, Integer genGs) throws Exception;
+    ResultData turntableUploadSuccess(String params, User user, boolean forceBuild, boolean checkUploadFile) throws Exception;
 
     ResultData rebuildScene(String num,Boolean force,Boolean deleteExtras, String from) throws IOException;
 

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -824,7 +824,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     }
 
     @Override
-    public ResultData turntableUploadSuccess(String params, User user, boolean forceBuild, boolean checkUploadFille, Integer genGs) throws Exception {
+    public ResultData turntableUploadSuccess(String params, User user, boolean forceBuild, boolean checkUploadFille) throws Exception {
         log.info("turntableUploadSuccess-params: " + params);
         String preParams = params;
         if (StringUtils.isEmpty(params)) {
@@ -898,7 +898,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         ScenePlusVO scenePlusVO = null;
 
-        fdageJson.put("genGs", genGs);
         if (ObjectUtils.isEmpty(scenePro) || (!ObjectUtils.isEmpty(scenePro.getIsUpgrade()) && scenePro.getIsUpgrade() == 1)) {
             scenePlusVO = buildScene(fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType, forceBuild);
         } else {