上传e57

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

@@ -167,8 +167,11 @@ public class BuildReverseE57SceneServiceImpl implements IBuildSceneService {
                 return;
             }
 
+            Integer isObj = scenePlusExt.getIsObj();
             JSONObject fdageData = new JSONObject();
-            fdageData.put("exportMeshObj", 1);
+            if(isObj == CommonStatus.YES.code().intValue()){
+                fdageData.put("exportMeshObj", 1);
+            }
             Map<String, String> uploadFiles = commonService.getUploadFiles(scenePlus,path,14,fdageData);
 
             String rebuild = message.getRebuild();
@@ -184,7 +187,6 @@ public class BuildReverseE57SceneServiceImpl implements IBuildSceneService {
 //            //读取计算结果文件生成videosJson
 //            JSONObject videosJson = null;
 
-            boolean isObj = fdageData.containsKey("exportMeshObj") && fdageData.getIntValue("exportMeshObj") == 1;
 
             //上传全景图俯视图
             this.uploadFloorCad(path, sceneCode, uploadFiles);
@@ -299,13 +301,13 @@ public class BuildReverseE57SceneServiceImpl implements IBuildSceneService {
         return true;
     }
 
-    private void updateDbPlus(int sceneSource,Long space,String videosJson, Long computeTime,boolean isObj,ScenePlusExt scenePlusExt){
+    private void updateDbPlus(int sceneSource,Long space,String videosJson, Long computeTime,Integer isObj,ScenePlusExt scenePlusExt){
 
         scenePlusExt.setSpace(space);
         scenePlusExt.setComputeTime(computeTime.toString());
         scenePlusExt.setAlgorithmTime(new Date());
         scenePlusExt.setVideos(videosJson);
-        scenePlusExt.setIsObj(isObj ? 1 : 0);
+        scenePlusExt.setIsObj(isObj);
 
         if(ModelTypeEnums.TILE_CODE.equals(modelType)){
             scenePlusExt.setSceneScheme(3);