激光3dtiles算法提前上

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

@@ -346,8 +346,7 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
 //            map.put(path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam", imagesPath + ConstantFileName.modelUUID + "_50k.dam");
 //        }
         //这里适配旧算法和新算法，生成obj|上传3dtiles
-        if (fdageData.containsKey("exportMeshObj") && fdageData.getIntValue("exportMeshObj") == 1
-            || (!ObjectUtils.isEmpty(cameraType) && (!cameraType.equals(14)))){
+        if (!ObjectUtils.isEmpty(cameraType) && (!cameraType.equals(14))){
             if(this.modelKind.equals(ModelKind.DAM.code())){
                 CreateObjUtil.convertTxtToDam(resultsPath + "tex" + File.separator + "modeldata.txt", resultsPath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam");
                 CreateObjUtil.convertDamToLzma(resultsPath + File.separator + "results/");
@@ -359,17 +358,17 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
                 fYunFileService.uploadFile(resultsPath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam.lzma", imagesPath + ConstantFileName.modelUUID + "_50k.dam.lzma");
                 fYunFileService.uploadFile(resultsPath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam", imagesPath + ConstantFileName.modelUUID + "_50k.dam");
             }
-            if(this.modelKind.equals(ModelKind.THREE_D_TILE.code())){
-                String threedtilesPath = resultsPath + ModelKind.THREE_D_TILE.code();
-                String oss3dtilesPath = imagesPath + ModelKind.THREE_D_TILE.code();
-                List<String> list = FileUtils.list(new File(threedtilesPath));
-                if(CollUtil.isEmpty(list)){
-                    log.error("3dtiles目录异常，3dtiles地址：{}", new File(path + File.separator + "results" + File.separator + ModelKind.THREE_D_TILE.code()));
-                    throw new Exception("3dtiles目录异常");
-                }
-                //上传3dtiles文件
-                fYunFileService.uploadFileByCommand(threedtilesPath, oss3dtilesPath);
-            }
+//            if(this.modelKind.equals(ModelKind.THREE_D_TILE.code())){
+//                String threedtilesPath = resultsPath + ModelKind.THREE_D_TILE.code();
+//                String oss3dtilesPath = imagesPath + ModelKind.THREE_D_TILE.code();
+//                List<String> list = FileUtils.list(new File(threedtilesPath));
+//                if(CollUtil.isEmpty(list)){
+//                    log.error("3dtiles目录异常，3dtiles地址：{}", new File(path + File.separator + "results" + File.separator + ModelKind.THREE_D_TILE.code()));
+//                    throw new Exception("3dtiles目录异常");
+//                }
+//                //上传3dtiles文件
+//                fYunFileService.uploadFileByCommand(threedtilesPath, oss3dtilesPath);
+//            }
         }
 
         CreateObjUtil.convertTxtToVisionmodeldata(resultsPath + "vision.txt", resultsPath + "vision.modeldata");