111

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -569,7 +569,13 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
                 vo.setTiledMap(tiledMap.getData());
 
                 Result<JSONObject> dataSetAndControlPoint = laserHttpClient.getDataSetAndControlPoint(laserHost, param.getNum());
-                vo.setGdMapStatus(dataSetAndControlPoint.getData().getJSONObject("controlPoint").getIntValue("status"));
+                JSONObject data = dataSetAndControlPoint.getData();
+                if(data != null){
+                    JSONObject controlPoint = data.getJSONObject("controlPoint");
+                    if(controlPoint != null){
+                        vo.setGdMapStatus(controlPoint.getIntValue("status"));
+                    }
+                }
             }
         }catch (Exception e){
             log.warn("获取激光场景信息出错,num:{}", param.getNum(), e);