From b1bfa089b5b299c1c3c71094e450748a5e5e8a75 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Aug 2023 15:35:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb_21' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 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 05f992c..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,6 +209,7 @@
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();
}
}
--
Gitblit v1.8.0