From 48e6c02fd6c030e3c3c85d80bea6a4a3fcd25d1b Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 3 Dec 2024 15:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AE=9A=E4=BD=8D=E5=9D=90?=
 =?UTF-8?q?=E6=A0=87=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhgd/netty/tcp/location/handler/LocationMsgHandler.java | 6 ++++--
 .../modules/vehicleposition/entity/VehiclePositionData.java | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/netty/tcp/location/handler/LocationMsgHandler.java b/src/main/java/com/zhgd/netty/tcp/location/handler/LocationMsgHandler.java
index 74ca0f0e0..9b47fe5d7 100644
--- a/src/main/java/com/zhgd/netty/tcp/location/handler/LocationMsgHandler.java
+++ b/src/main/java/com/zhgd/netty/tcp/location/handler/LocationMsgHandler.java
@@ -17,6 +17,7 @@ import com.zhgd.xmgl.modules.vehicleposition.mapper.VehiclePositionDayRecordMapp
 import com.zhgd.xmgl.modules.vehicleposition.mapper.VehiclePositionDevMapper;
 import com.zhgd.xmgl.modules.vehicleposition.service.IVehiclePositionAlarmService;
 import com.zhgd.xmgl.modules.vehicleposition.service.IVehiclePositionDataService;
+import com.zhgd.xmgl.util.CoordinateTransformUtil;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -66,6 +67,7 @@ public class LocationMsgHandler extends BaseHandler<LocationMsg> {
         if (longitude == 0L && latitude == 0L) {
             return;
         }
+        double[] cj02s = CoordinateTransformUtil.transformWGS84ToGCJ02(longitude, latitude);
         VehiclePositionDev dev = vehiclePositionDevMapper.selectOne(new LambdaQueryWrapper<VehiclePositionDev>()
                 .eq(VehiclePositionDev::getDevSn, location.getTerminalPhone()));
         if (dev == null) {
@@ -91,8 +93,8 @@ public class LocationMsgHandler extends BaseHandler<LocationMsg> {
             vehiclePositionData.setTotalSleepTimeDay(hourBt);
             vehiclePositionData.setTotalWorkTimeDay(0D);
         }
-        vehiclePositionData.setLongitude(Double.valueOf(longitude));
-        vehiclePositionData.setLatitude(Double.valueOf(latitude));
+        vehiclePositionData.setLongitude(cj02s[0]);
+        vehiclePositionData.setLatitude(cj02s[1]);
         vehiclePositionData.setProjectSn(dev.getProjectSn());
         vehiclePositionData.setSpeed(Double.valueOf(location.getSpeed()));
         vehiclePositionDataService.add(vehiclePositionData);
diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionData.java b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionData.java
index 43ddd330e..181a362d9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/entity/VehiclePositionData.java
@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.vehicleposition.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;