From 62e742edea4cddbfba1033c7e94142df93133378 Mon Sep 17 00:00:00 2001
From: jkcdev <dingchao@jkcchina.com>
Date: Tue, 13 May 2025 17:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=91=E8=A1=8C=E8=BD=A8=E8=BF=B9=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E5=85=A5=E5=BA=93=E6=97=B6GPS=E5=9D=90=E6=A0=87?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E8=BD=AC=E4=B8=BAGCJ02=EF=BC=8C=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=9A=84=E6=97=B6=E5=80=99=E5=B0=B1=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EbikeTrackingServiceImpl.java        | 11 +++++++----
 ebike-orders/pom.xml                                  |  6 ++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

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<EbikeTracking> 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 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${boot.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring-boot3-starter</artifactId>