From 4357c441d3486e7d7cc4e3047650c91226106c24 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 29 Apr 2022 13:50:33 +0800
Subject: [PATCH] 蜂窝图修改设备无数据是报错情况

---
 screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
index e9539ae..05f992c 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
@@ -213,13 +213,15 @@
                         }
                     }
                     Map<String, Object> map = historyDataMap.get(near_mac);
-                    String value = map.get("value").toString();
-                    JSONObject jsonObject = JSONObject.parseObject(value);
-                    Double sensorValue = Double.parseDouble(jsonObject.get(sensorCode).toString());
-                    resultMap.put("lon",point_lon);
-                    resultMap.put("lat",point_lat);
-                    resultMap.put("value",sensorValue);
-                    resultList.add(resultMap);
+                    if (map != null){
+                        String value = map.get("value").toString();
+                        JSONObject jsonObject = JSONObject.parseObject(value);
+                        Double sensorValue = Double.parseDouble(jsonObject.get(sensorCode).toString());
+                        resultMap.put("lon",point_lon);
+                        resultMap.put("lat",point_lat);
+                        resultMap.put("value",sensorValue);
+                        resultList.add(resultMap);
+                    }
                 }
                 point_lat = DoubleUtils.add(point_lat,lat_ontShare);
             }

--
Gitblit v1.8.0