|
@@ -87,8 +87,8 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
|
|
|
model.setUserName(username);
|
|
|
this.save(model);
|
|
|
File newObjFile = null;
|
|
|
+ String objPath = String.format(OBJ_PATH , "modelId_"+model.getModelId()) ;
|
|
|
try {
|
|
|
- String objPath = String.format(OBJ_PATH , "modelId_"+model.getModelId()) ;
|
|
|
String glbOssPath = String.format(FilePath.GLB_OSS_PATH, model.getModelId());
|
|
|
|
|
|
newObjFile = new File(objPath +"/" + fileName);
|
|
@@ -121,15 +121,15 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
|
|
|
glbOssPath = glbOssPath.replace("mesh.glb","webcloud");
|
|
|
model.setModelDateType("ply");
|
|
|
model.setModelType("ply");
|
|
|
- OBJToGLBUtil.lasOrPlyToBin(file1);
|
|
|
- uploadToOssUtil.uploadFileOss(file1 ,glbOssPath);
|
|
|
+ File mntFile = OBJToGLBUtil.lasOrPlyToBin(file1);
|
|
|
+ uploadToOssUtil.uploadFileOss(mntFile ,glbOssPath);
|
|
|
}
|
|
|
if(name.contains(".las")){
|
|
|
glbOssPath = glbOssPath.replace("mesh.glb","webcloud");
|
|
|
model.setModelDateType("las");
|
|
|
model.setModelType("las");
|
|
|
- OBJToGLBUtil.lasOrPlyToBin(file1);
|
|
|
- uploadToOssUtil.uploadFileOss(file1 ,glbOssPath);
|
|
|
+ File mntFile = OBJToGLBUtil.lasOrPlyToBin(file1);
|
|
|
+ uploadToOssUtil.uploadFileOss(mntFile ,glbOssPath);
|
|
|
|
|
|
}
|
|
|
}
|
|
@@ -145,6 +145,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
|
|
|
if(newObjFile!=null){
|
|
|
newObjFile.delete();
|
|
|
}
|
|
|
+ new File(objPath).delete();
|
|
|
}
|
|
|
|
|
|
}
|