|
@@ -855,16 +855,16 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
|
String bucket = scenePlusExt.getYunFileBucket();
|
|
|
|
|
|
- String key = String.format(UploadFilePath.DATA_VIEW_PATH, param.getNum()) + "floorplan_cad.json";
|
|
|
- String floorplanCadJson = fYunFileService.getFileContent(bucket, key);
|
|
|
- if(StrUtil.isEmpty(floorplanCadJson)){
|
|
|
+ String key = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + "floorplan.json";
|
|
|
+ String floorplanJson = fYunFileService.getFileContent(bucket, key);
|
|
|
+ if(StrUtil.isEmpty(floorplanJson)){
|
|
|
return ResultData.ok();
|
|
|
}
|
|
|
Map<Integer, String> renameMap = new HashMap<>();
|
|
|
param.getFloors().stream().forEach(floor->{
|
|
|
renameMap.put(floor.getSubgroup(), floor.getName());
|
|
|
});
|
|
|
- JSONObject jsonObject = JSON.parseObject(floorplanCadJson);
|
|
|
+ JSONObject jsonObject = JSON.parseObject(floorplanJson);
|
|
|
if(Objects.isNull(jsonObject)){
|
|
|
return ResultData.ok();
|
|
|
}
|