From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:13:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 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..c2ad449 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
@@ -209,17 +209,20 @@
Device device = devicesMap.get(key);
double getmeter1 = LongitudeAndLatitudeUtils.getmeter(point_lon, point_lat, device.getLongitude(), device.getLatitude());
if (getmeter1<getmeter){
+ getmeter=getmeter1;
near_mac = device.getMac();
}
}
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