上传模型

src/main/java/com/fdkankan/scene/constant/CmdConstant.java

@@ -111,6 +111,8 @@ public class CmdConstant {
     public static final String BUILD_MODEL_COMMAND = "bash /home/ubuntu/bin/Launcher.sh  @inPath";
     public static final String BUILD_MODEL_COMMAND_WIN = "Launcher.bat @inPath";
 
+    public static final String BUILD_3DTILES_MODEL_COMMAND_WIN = "Obj2Tiles.bat @inPath";
+
     //生成模型的命令
     public static final String KILL_BUILD_MODEL_COMMAND = "ps -ef | grep MainLoader.exe | grep -v grep | awk '{print $2}' | xargs kill -9";
 

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

@@ -20,6 +20,7 @@ import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.scene.bean.SceneBean;
+import com.fdkankan.scene.config.FdkkLaserConfig;
 import com.fdkankan.scene.util.CmdBuildUtil;
 import com.fdkankan.web.response.ResultData;
 import com.fdkankan.model.utils.ComputerUtil;
@@ -821,7 +822,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         //调用算法
         String command = "bash /home/ubuntu/bin/Obj2Tiles.sh " + path;
         log.info("上传3dtiles模型开始, num:{}, targetPath:{}", num, path);
-        CmdBuildUtil.BuildModelCommand(path);
+        CmdBuildUtil.Build3dtilesModel(path);
         log.info("上传3dtiles模型结束, num:{}, targetPath:{}", num, path);
 
         //检测计算结果
@@ -838,11 +839,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         //算法计算完后，生成压缩文件，上传到oss
         //上传3dtiles
         ossUtil.deleteObject(bucket,String.format(UploadFilePath.IMG_VIEW_PATH, num) + "3dtiles");
-        ossUtil.uploadFileDirCmd(bucket, tilesPath, String.format(UploadFilePath.IMG_VIEW_PATH, num) + "3dtiles", false);
+        FileUtil.copyContent(
+                FileUtil.file(tilesPath),
+                FileUtil.file(FdkkLaserConfig.getProfile(bucket) + File.separator + String.format(UploadFilePath.IMG_VIEW_PATH, num) + "3dtiles"),
+                true);
         //上传mesh
         ossUtil.deleteObject(bucket,String.format(UploadFilePath.DATA_VIEW_PATH, num) + "mesh");
-        ossUtil.uploadFileDirCmd(bucket,meshPath, String.format(UploadFilePath.DATA_VIEW_PATH, num) + "mesh", false);
-
+        FileUtil.copyContent(
+                FileUtil.file(meshPath),
+                FileUtil.file(FdkkLaserConfig.getProfile(bucket) + File.separator + String.format(UploadFilePath.DATA_VIEW_PATH, num) + "mesh"),
+                true);
     }
 
     private void uploadFileofterRebuildPanoram(String path, String filePath, String sceneNum, String bucket) throws Exception {

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

@@ -190,7 +190,12 @@ public class CmdBuildUtil {
             CmdUtils.callLineWin(buildModelCommandCmd);
 
         }
+    }
 
+    public static void Build3dtilesModel(String inPath) {
+        String buildModelCommandCmd = CmdConstant.BUILD_3DTILES_MODEL_COMMAND_WIN
+                .replace("@inPath", inPath);
+        CmdUtils.callLineWin(buildModelCommandCmd);
     }
 
     static void KillBuildModelCommand() {