|
@@ -789,7 +789,16 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
|
|
result.put("version", "2.1");
|
|
result.put("version", "2.1");
|
|
|
|
|
|
String floorplanCadPath = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "floorplan_cad.json";
|
|
String floorplanCadPath = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "floorplan_cad.json";
|
|
- String floorcadStr = uploadToOssUtil.getObjectContent(this.bucket, floorplanCadPath);
|
|
|
|
|
|
+ String floorcadStr = null;
|
|
|
|
+ try {
|
|
|
|
+ floorcadStr = uploadToOssUtil.getObjectContent(this.bucket, floorplanCadPath);
|
|
|
|
+ }catch (Exception e){
|
|
|
|
+ log.warn("生成houseType.json失败,floorplan_cad.json找不到, floorplanCadPath:{}", floorplanCadPath);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ if(StrUtil.isEmpty(floorcadStr)){
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
|
|
JSONObject floorcadObj = JSON.parseObject(floorcadStr);
|
|
JSONObject floorcadObj = JSON.parseObject(floorcadStr);
|
|
JSONArray floors = floorcadObj.getJSONArray("floors");
|
|
JSONArray floors = floorcadObj.getJSONArray("floors");
|