1

src/main/java/com/fdkankan/fusion/service/impl/ThreadService.java

@@ -81,8 +81,8 @@ public class ThreadService {
             String name = file1.getName();
             if(name.contains("obj") || name.contains("OBJ")){
                 glbOssPath = glbOssPath.replace("mesh.glb",file1.getName().replace(".obj",".glb"));
-                model.setModelDateType("obj");
-                model.setModelType("glb");
+                model.setModelDateType("glb");
+                model.setModelType("obj");
                 OBJToGLBUtil.objToGlb2(file1.getPath(), file1.getPath().replace(".obj",".glb"));
                 redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"65");
                 uploadToOssUtil.uploadOss(file1.getPath().replace(".obj",".glb"),glbOssPath);
@@ -115,7 +115,7 @@ public class ThreadService {
             String b3dmPath = objPathFile.getPath().replace(FilePath.LOCAL_BASE_PATH,"fusion/");
             if(name.contains(".osgb")){
                 model.setModelDateType("b3dm");
-                model.setModelType("b3dm");
+                model.setModelType("osgb");
 
                 redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"60");
                 String localPath = OBJToGLBUtil.OsgbToB3dm(objPathFile);