From 7c337a40a7edae16b409ea0abf21be119fd67a59 Mon Sep 17 00:00:00 2001
From: lianlonggang <lianlonggang@qq.com>
Date: Mon, 15 Dec 2025 16:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=BE=B7=E5=9C=B0=E5=9D=80=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WatchMonitorDataServiceImpl.java        | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java
index e0ef558..e9c5906 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java
@@ -288,8 +288,9 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
         if (Stream.of(data.getLon(), data.getLat()).allMatch(value -> ObjUtil.isNotEmpty(value) && value != 0)) {
             Gps gps = GPS84ToGCJ02(data.getLon(), data.getLat());
             if (null != gps) {
-                monitorDataEntity.setLon(gps.getLongitude());
-                monitorDataEntity.setLat(gps.getLatitude());
+                //原始值不要改动
+//                monitorDataEntity.setLon(gps.getLongitude());
+//                monitorDataEntity.setLat(gps.getLatitude());
                 monitorDataEntity.setLonGd(BigDecimal.valueOf(gps.getLongitude()));
                 monitorDataEntity.setLatGd(BigDecimal.valueOf(gps.getLatitude()));
                 //获取高德地址信息
@@ -340,6 +341,17 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
         socketVo.setWorkNo(userNew.getWorkNo());
         socketVo.setSex(userNew.getSex());
         socketVo.setAge(userNew.getAge());
+        // 先赋值处理一下，socket数据全部改为高德坐标
+        if(monitorDataEntity.getLonGd() != null){
+            socketVo.setLon(monitorDataEntity.getLonGd().doubleValue());
+        }
+        if(monitorDataEntity.getLatGd() != null){
+            socketVo.setLat(monitorDataEntity.getLatGd().doubleValue());
+        }
+        if(StrUtil.isNotBlank(monitorDataEntity.getAddressGd())){
+            socketVo.setAddress(monitorDataEntity.getAddressGd());
+        }
+
         if (null != userNew.getDepart()) {
             socketVo.setOrgName(userNew.getDepart().getDepartName());
         }