lyhzzz 3 سال پیش
والد
کامیت
bcb55d3cb1

+ 1 - 1
src/main/java/com/fdkankan/fusion/common/FilePath.java

@@ -6,7 +6,7 @@ public class FilePath {
     public final static String hotIconDefaultPath = "fusion/default/tag_icon_default.svg";
 
     public final static String OBJ_OSS_PATH = "scene_view_data/%s/data/mesh";
-    public final static String GLB_OSS_PATH = "fusion/model/glb";
+    public final static String GLB_OSS_PATH = "fusion/model/glb/%s/mesh.glb";
 
 
 }

+ 6 - 1
src/main/java/com/fdkankan/fusion/common/util/OBJToGLBUtil.java

@@ -13,11 +13,16 @@ import java.util.LinkedHashSet;
 public class OBJToGLBUtil {
 
     public static void objToGlb(String objPath, String glbPath)  {
+        log.info("obj转换glb开始,{}",objPath);
         checkObj(objPath);
         log.info("obj转换glb开始");
         String command = "obj2gltf " + objPath + " " + glbPath;
         log.info("执行obj转换glb命令路径-{}", command);
-        CreateObjUtil.callshell(command);
+        try {
+            Process process = Runtime.getRuntime().exec(command);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         log.info("obj转换glb完毕:" + command);
     }
 

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/CaseNumServiceImpl.java

@@ -75,7 +75,7 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
         if(type == 0 || type == 1){ //看看,看见
             String objPath = String.format(OBJ_PATH ,num);
             String glbPath = String.format(GLB_PATH,num);
-            String glbOssPath = FilePath.GLB_OSS_PATH +"/" + num;
+            String glbOssPath = String.format(FilePath.GLB_OSS_PATH , num);
             List<String> fileList = uploadToOssUtil.listKeysFromAli(String.format(FilePath.OBJ_OSS_PATH, num));
             for (String fileName : fileList) {
                 File file = new File(objPath);

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -85,7 +85,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         try {
             String objPath = String.format(OBJ_PATH , "modelId_"+model.getModelId());
             String glbPath = String.format(GLB_PATH , "modelId_"+model.getModelId());
-            String glbOssPath = FilePath.GLB_OSS_PATH +"/" + model.getModelId();
+            String glbOssPath = String.format(FilePath.GLB_OSS_PATH, model.getModelId());
             model.setModelObjUrl(objPath);
             model.setModelGlbUrl(queryPath +"/"+glbPath);