From 0ba960219b2f0eb5741ad315063b745527d22c1d Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Thu, 16 Oct 2025 10:37:56 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8A=8A=E5=80=BE=E8=A7=92=E8=AE=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E5=A4=84=E7=90=86=E6=8C=AA=E5=88=B0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=96=B0=E7=9A=84=E6=9C=8D=E5=8A=A1InclineSe?=
 =?UTF-8?q?rver=202=E3=80=81InclineServer=E5=A4=84=E7=90=86D350=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=AC=AC=E4=B8=89=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/D350SurfaceInclineMessageExecutor.java         | 1 +
 .../inclide_server/service/InclineDataForwarder.java        | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java b/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java
index 2867d6e3..8d4f5d9e 100644
--- a/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java
+++ b/sec-incline-server/src/main/java/com/imdroid/inclide_server/executor/D350SurfaceInclineMessageExecutor.java
@@ -78,6 +78,7 @@ public class D350SurfaceInclineMessageExecutor implements Executor<D350SurfaceIn
                     .select("d.latitude as latitude")
                     .select("d.longitude as longitude")
                     .leftJoin("gnssstatus d on t.deviceid = d.deviceid")
+                    .eq("t.deviceid",deviceId)
                     .last("limit 1");
             device = deviceMapper.selectJoinOne(GnssDeviceJoin.class, jquery);
             if(device != null) deviceInfoMap.put(deviceId,device);
diff --git a/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java b/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java
index cad142b5..1431d419 100644
--- a/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java
+++ b/sec-incline-server/src/main/java/com/imdroid/inclide_server/service/InclineDataForwarder.java
@@ -126,8 +126,10 @@ public class InclineDataForwarder{
         data.setZy(NumberUtils.scale((double) Zy, 3));
         data.setZz(NumberUtils.scale((double) Zz, 3));
         // 经纬度
-        data.setDevLng(device.getLongitude());
-        data.setDevLat(device.getLatitude());
+        if(device.getLongitude()!=null && device.getLatitude()!=null) {
+            data.setDevLng(device.getLongitude());
+            data.setDevLat(device.getLatitude());
+        }
 
         // 发送
         TCPClient tcpClient1 = tcpClientMap.get(device.getFwd_group_id());