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 c84c2e63..61edab9b 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,14 +86,17 @@ 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().filter(point -> !CoordinateUtil.outOfChina(point.getLongitude(), point.getLatitude())).map(point -> { + return points.stream().map(point -> { EbikeTrackingDto ebikeTrackingDto = new EbikeTrackingDto(); BeanUtils.copyProperties(point, ebikeTrackingDto); Instant _time = point.get_time(); ebikeTrackingDto.setTime(ConvertUtil.instantToDatetime(_time)); - double[] gcj02 = CoordinateUtil.WGS84ToGCJ02(point.getLongitude(), point.getLatitude()); - ebikeTrackingDto.setLngGCJ02(gcj02[0]); - ebikeTrackingDto.setLatGCJ02(gcj02[1]); + // GPS入库的时候已经转为GCJ02坐标系 + ebikeTrackingDto.setLngGCJ02(point.getLongitude()); + ebikeTrackingDto.setLatGCJ02(point.getLatitude()); + //double[] gcj02 = CoordinateUtil.WGS84ToGCJ02(point.getLongitude(), point.getLatitude()); + //ebikeTrackingDto.setLngGCJ02(gcj02[0]); + //ebikeTrackingDto.setLatGCJ02(gcj02[1]); return ebikeTrackingDto; }).toList(); }else{ diff --git a/ebike-orders/pom.xml b/ebike-orders/pom.xml index 558a5384..a1172870 100644 --- a/ebike-orders/pom.xml +++ b/ebike-orders/pom.xml @@ -30,6 +30,12 @@ 0.0.1-SNAPSHOT + + org.springframework.boot + spring-boot-starter-web + ${boot.version} + + com.mybatis-flex mybatis-flex-spring-boot3-starter