|
@@ -129,14 +129,14 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
|
|
|
if(localToOssUtil.existKey(scene.getWebPath() +mesh3DtilesPath)){
|
|
|
model.setModelDateType("b3dm");
|
|
|
model.setModelType("b3dm");
|
|
|
- model.setModelGlbUrl(JSONArray.toJSONString(Arrays.asList(scene.getMapping() +mesh3DtilesPath)));
|
|
|
+ model.setModelGlbUrl(JSONArray.toJSONString(Arrays.asList(scene.getMapping() +File.separator +mesh3DtilesPath)));
|
|
|
model.setModelSize(FileWriterUtil.setFileSize(localToOssUtil.getSizeCount( sizePath)));
|
|
|
}else {
|
|
|
String meshPath = String.format(FilePath.OBJ_OSS_PATH, num)+"/data/mesh";
|
|
|
if(localToOssUtil.existKey( scene.getWebPath() +meshPath +"/mesh.obj")){
|
|
|
Long size = localToOssUtil.getSizeCount( scene.getWebPath() +meshPath);
|
|
|
model.setModelSize(FileWriterUtil.setFileSize(size));
|
|
|
- model.setModelGlbUrl(JSONArray.toJSONString(Arrays.asList(scene.getMapping() + meshPath+"/mesh.obj")));
|
|
|
+ model.setModelGlbUrl(JSONArray.toJSONString(Arrays.asList(scene.getMapping()+File.separator + meshPath+"/mesh.obj")));
|
|
|
}else {
|
|
|
List<String> objPaths = new ArrayList<>();
|
|
|
String meshPathjs = String.format(FilePath.OBJ_OSS_PATH, num)+"/data/";
|
|
@@ -152,7 +152,7 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
|
|
|
for (Object object : floors1) {
|
|
|
JSONObject jb = (JSONObject) object;
|
|
|
String string = jb.getString("objPath");
|
|
|
- objPaths.add(scene.getMapping() +meshPathjs + string);
|
|
|
+ objPaths.add(scene.getMapping()+File.separator +meshPathjs + string);
|
|
|
}
|
|
|
model.setModelGlbUrl(JSONArray.toJSONString(objPaths));
|
|
|
Long size = localToOssUtil.getSize(scene.getWebPath() +meshPath);
|