|
@@ -80,11 +80,12 @@ public class ThreadService {
|
|
|
|
|
|
String name = file1.getName();
|
|
|
if(name.contains("obj") || name.contains("OBJ")){
|
|
|
- String localPath = FilePath.LOCAL_BASE_PATH + String.format(FilePath.MODEL_OSS_PATH,environment, model.getModelId());
|
|
|
- model.setModelDateType("obj");
|
|
|
+ String localPath = FilePath.LOCAL_BASE_PATH + String.format(FilePath.MODEL_OSS_PATH,environment, model.getModelId())+"/b3dm";
|
|
|
+ model.setModelDateType("b3dm");
|
|
|
model.setModelType("b3dm");
|
|
|
OBJToGLBUtil.objToB3dm2(file1.getPath(),localPath);
|
|
|
redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"65");
|
|
|
+ ossPath = localPath.replace("/mnt/","");
|
|
|
ShellUtil.yunUpload(localPath,ossPath);
|
|
|
model.setModelGlbUrl(JSONArray.toJSONString(Arrays.asList(queryPath + ossPath+"/tileset.json")));
|
|
|
|