|
|
@@ -135,12 +135,12 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
|
|
|
String resultFormat = modelFileFormat;
|
|
|
switch (modelFileFormat){
|
|
|
case "obj" : resultFormat = "obj";
|
|
|
- url = uploadObjOss(ossZipPath,modelFile);break;
|
|
|
- case "laz" : url = uploadLazOss(ossZipPath,modelFile); break;
|
|
|
- case "shp" : url = uploadOss(ossZipPath,modelFile); break;
|
|
|
- case "b3dm" : url = uploadB3dm(ossZipPath,modelFile); break;
|
|
|
+ url = uploadObjOss(unzipPath,modelFile);break;
|
|
|
+ case "laz" : url = uploadLazOss(unzipPath,modelFile); break;
|
|
|
+ case "shp" : url = uploadOss(unzipPath,modelFile); break;
|
|
|
+ case "b3dm" : url = uploadB3dm(unzipPath,modelFile); break;
|
|
|
case "las" :
|
|
|
- case "ply" : url = uploadLasOrPly(ossZipPath,modelFile);break;
|
|
|
+ case "ply" : url = uploadLasOrPly(unzipPath,modelFile);break;
|
|
|
case "osgb":
|
|
|
resultFormat = "b3dm";
|
|
|
break;
|
|
|
@@ -170,7 +170,7 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
|
|
|
// }
|
|
|
String ossKey = unzipPath.replace(OssPath.localPath,"");
|
|
|
ShellUtil.yunUpload(unzipPath,ossKey);
|
|
|
- return fusionConfig.getOssUrlPrefix() + ossKey +File.separator+modelFile.getName();
|
|
|
+ return ossKey +File.separator+modelFile.getName();
|
|
|
}
|
|
|
|
|
|
private String uploadB3dm(String unzipPath, File modelFile) {
|
lyhzzz