|
@@ -115,22 +115,21 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
|
|
model.setModelType("glb");
|
|
model.setModelType("glb");
|
|
OBJToGLBUtil.objToGlb(objPath,name, file1.getPath().replace("obj","glb"));
|
|
OBJToGLBUtil.objToGlb(objPath,name, file1.getPath().replace("obj","glb"));
|
|
uploadToOssUtil.uploadOss(file1.getPath(),glbOssPath);
|
|
uploadToOssUtil.uploadOss(file1.getPath(),glbOssPath);
|
|
-
|
|
|
|
}
|
|
}
|
|
if(name.contains(".ply")){
|
|
if(name.contains(".ply")){
|
|
- glbOssPath = glbOssPath.replace("mesh.glb","webcloud");
|
|
|
|
model.setModelDateType("ply");
|
|
model.setModelDateType("ply");
|
|
model.setModelType("ply");
|
|
model.setModelType("ply");
|
|
- File mntFile = OBJToGLBUtil.lasOrPlyToBin(file1);
|
|
|
|
- uploadToOssUtil.uploadFileOss(mntFile ,glbOssPath);
|
|
|
|
}
|
|
}
|
|
if(name.contains(".las")){
|
|
if(name.contains(".las")){
|
|
- glbOssPath = glbOssPath.replace("mesh.glb","webcloud");
|
|
|
|
model.setModelDateType("las");
|
|
model.setModelDateType("las");
|
|
model.setModelType("las");
|
|
model.setModelType("las");
|
|
|
|
+ }
|
|
|
|
+ if(model.getModelType().equals("las") || model.getModelType().equals("ply")){
|
|
|
|
+ glbOssPath = glbOssPath.replace("model","model_"+model.getModelId());
|
|
|
|
+ glbOssPath = glbOssPath.replace("glb","res");
|
|
|
|
+ glbOssPath = glbOssPath.replace("mesh.glb","webcloud");
|
|
File mntFile = OBJToGLBUtil.lasOrPlyToBin(file1);
|
|
File mntFile = OBJToGLBUtil.lasOrPlyToBin(file1);
|
|
uploadToOssUtil.uploadFileOss(mntFile ,glbOssPath);
|
|
uploadToOssUtil.uploadFileOss(mntFile ,glbOssPath);
|
|
-
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
model.setModelObjUrl(objPath);
|
|
model.setModelObjUrl(objPath);
|