111

111

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -928,7 +928,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         //原始计算根目录
 //      String path = "F:\\test";
-        String path = scenePlusExt.getDataSource();
+        String path = sceneService.getDataSource(num, scenePlus.getSceneSource(), scenePlusExt.getDataSource());
         //全景图计算根目录
         String target = path + "_images";
         //解压缩文件存放目录
@@ -1064,7 +1064,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             FileUtils.delAllFile(target + File.separator + "results");
         }
 
-        FileUtil.copy(path.concat(File.separator).concat("capture").concat("data.fdage"), target.concat(File.separator).concat("capture").concat(File.separator).concat("data.fdage"), true);
+        FileUtil.copy(path.concat(File.separator).concat("capture").concat(File.separator).concat("data.fdage"), target.concat(File.separator).concat("capture").concat(File.separator).concat("data.fdage"), true);
 
         //如果部分成功，则需要返回成功数量和失败列表
         if(CollUtil.isNotEmpty(notExistFileList)){

src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -821,8 +821,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         //调用算法
         String command = "bash /home/ubuntu/bin/Obj2Tiles.sh " + path;
         log.info("上传3dtiles模型开始, num:{}, targetPath:{}", num, path);
-//        RuntimeUtil.exec(command);
-        CreateObjUtil.callshell(command);
+        CmdBuildUtil.BuildModelCommand(path);
         log.info("上传3dtiles模型结束, num:{}, targetPath:{}", num, path);
 
         //检测计算结果

src/main/java/com/fdkankan/scene/util/CmdBuildUtil.java

@@ -187,7 +187,7 @@ public class CmdBuildUtil {
         } else {
             buildModelCommandCmd = CmdConstant.BUILD_MODEL_COMMAND_WIN
                     .replace("@inPath", inPath);
-            CmdUtils.callLine(buildModelCommandCmd);
+            CmdUtils.callLineWin(buildModelCommandCmd);
 
         }