|
@@ -132,7 +132,6 @@ public class ThreadService {
|
|
|
|
|
|
redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"60");
|
|
|
String localPath = OBJToGLBUtil.OsgbToB3dm(objPathFile);
|
|
|
- osgbFile = new File(localPath.replace("mnt/fusion/b3dm","/mnt/fusion/osgb"));
|
|
|
b3dmFile = new File(localPath);
|
|
|
b3dmJsonPath = FileWriterUtil.checkB3dmTileset(b3dmFile);
|
|
|
if(b3dmJsonPath == null){
|
|
@@ -143,6 +142,7 @@ public class ThreadService {
|
|
|
String replace = b3dmJsonPath.replace(FilePath.MNT_BASE_PATH, "fusion/"+environment+"/");
|
|
|
File file2 = new File(replace);
|
|
|
ShellUtil.yunUpload(localPath,file2.getParent());
|
|
|
+ ShellUtil.yunUpload(objPathFile.getPath(),objPathFile.getPath().replace("/mnt/",""));
|
|
|
model.setModelGlbUrl((JSONArray.toJSONString(Arrays.asList(queryPath + replace))));
|
|
|
}
|
|
|
|