|
@@ -91,14 +91,27 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
Model model = modelService.getIsNullNewByNum(num,param.getType());
|
|
Model model = modelService.getIsNullNewByNum(num,param.getType());
|
|
- model.setUpdateTime(null);
|
|
|
|
|
|
+ if(model.getModelId() != null && StringUtils.isNotBlank(model.getModelGlbUrl()) && StringUtils.isNotBlank(model.getModelSize())){
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
model.setModelDateType("obj");
|
|
model.setModelDateType("obj");
|
|
model.setType(param.getType());
|
|
model.setType(param.getType());
|
|
model.setModelType("pointcloud"); //深时点云类型
|
|
model.setModelType("pointcloud"); //深时点云类型
|
|
|
|
+ model.setCreateStatus(1);
|
|
if(param.getType() == 0 || param.getType() == 1 || param.getType() == 4 || param.getType() == 6){ //看看,看见
|
|
if(param.getType() == 0 || param.getType() == 1 || param.getType() == 4 || param.getType() == 6){ //看看,看见
|
|
- model.setModelObjUrl(String.format(FilePath.OBJ_LOCAL_PATH,environment ,num) +"/mesh.obj");
|
|
|
|
- model.setModelGlbUrl(getGlbUrl(param.getType(),num,model));
|
|
|
|
- model.setModelType("glb");
|
|
|
|
|
|
+ String mesh3DtilesPath = String.format(FilePath.OBJ_OSS_PATH,num) + "/images/3dtiles/tileset.json";
|
|
|
|
+ String sizePath = String.format(FilePath.OBJ_OSS_PATH,num) + "/images/3dtiles";
|
|
|
|
+ if(uploadToOssUtil.existKey(mesh3DtilesPath)){
|
|
|
|
+ model.setModelDateType("b3dm");
|
|
|
|
+ model.setModelType("b3dm");
|
|
|
|
+ model.setModelGlbUrl(JSONArray.toJSONString(Arrays.asList(queryPath +mesh3DtilesPath)));
|
|
|
|
+ model.setModelSize(FileWriterUtil.setFileSize(uploadToOssUtil.getSize( sizePath)));
|
|
|
|
+ }else {
|
|
|
|
+ model.setModelObjUrl(String.format(FilePath.OBJ_LOCAL_PATH,environment ,num) +"/mesh.obj");
|
|
|
|
+ model.setModelGlbUrl(getGlbUrl(param.getType(),num,model));
|
|
|
|
+ model.setModelType("glb");
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
model.setNum(num);
|
|
model.setNum(num);
|
|
model.setCreateStatus(1);
|
|
model.setCreateStatus(1);
|