Merge branch 'release-知象光电' into test

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

@@ -65,6 +65,9 @@ public class BuildServiceImpl implements IBuildService {
                 }
                 if(location == 8){//四维深巡
                     splitType = "SPLIT_V16";
+                    if(fdageData.getIntValue("zxState") == 1){//带知象光电
+                        splitType = "SPLIT_V33";
+                    }
                 }
                 if (!ObjectUtils.isEmpty(fdageData)) {
                     if ((fdageData.containsKey("exportMeshObj") && fdageData.getIntValue("exportMeshObj") == 1)) {

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

@@ -871,10 +871,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             log.info("data.fdage文件为空");
             throw new BusinessException(CameraConstant.FAILURE_6009);
         }
-        if(fdageJson.getIntValue("zxState") == 1){
-            sceneZxgdService.upload(fileId, fdageJson);
-            return ResultData.ok();
-        }
+//        if(fdageJson.getIntValue("zxState") == 1){
+//            sceneZxgdService.upload(fileId, fdageJson);
+//            return ResultData.ok();
+//        }
 
         this.removeUpdateV4(ConstantFilePath.OSS_PREFIX + prefixBuffer + "data.fdage", fdageJson);
         String buildType = "V3";