diff --git a/ebike-common/src/main/java/com/cdzy/common/utils/CoordinateUtil.java b/ebike-common/src/main/java/com/cdzy/common/utils/CoordinateUtil.java index b3940588..b9037810 100644 --- a/ebike-common/src/main/java/com/cdzy/common/utils/CoordinateUtil.java +++ b/ebike-common/src/main/java/com/cdzy/common/utils/CoordinateUtil.java @@ -58,7 +58,7 @@ public class CoordinateUtil { } // 国内范围判断 - private static boolean outOfChina(double lon, double lat) { + public static boolean outOfChina(double lon, double lat) { return lon < 72.004 || lon > 137.8347 || lat < 0.8293 || lat > 55.8271; } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeTrackingServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeTrackingServiceImpl.java index 744e6bb1..c84c2e63 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeTrackingServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeTrackingServiceImpl.java @@ -86,7 +86,7 @@ public class EbikeTrackingServiceImpl implements EbikeTrackingService { fluxQuery.add(" |> pivot(rowKey: [\"_time\"], columnKey: [\"_field\"], valueColumn: \"_value\")"); QueryApi queryApi = influxDBClient.getQueryApi(); List points = queryApi.query(fluxQuery.toString(), EbikeTracking.class); - return points.stream().map(point -> { + return points.stream().filter(point -> !CoordinateUtil.outOfChina(point.getLongitude(), point.getLatitude())).map(point -> { EbikeTrackingDto ebikeTrackingDto = new EbikeTrackingDto(); BeanUtils.copyProperties(point, ebikeTrackingDto); Instant _time = point.get_time();