From 43a53e5a46ba45a6d35e3913fdfdd6f82a84a038 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 12:59:32 +0800
Subject: [PATCH] jtt808初始化

---
 server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
index c77a7a0..d4efb88 100644
--- a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
@@ -237,7 +237,7 @@
             if(array == null || array.size() ==0){
                 continue;
             }
-            if(PositionUtil.isInPolygon(lat,lng,array)){
+            if(PositionUtil.isInPolygon(lng,lat,array)){
                 //濡傛灉鍦ㄥ仠杞︾偣鑼冨洿鍐咃紱
                 site = sites;
                 break;
@@ -330,6 +330,7 @@
             if(m.getLongitude()!=0){
                 bike.setLongitude(new BigDecimal(m.getLongitude()).divide(new BigDecimal(1000000),8,BigDecimal.ROUND_HALF_UP));
             }
+            updateMapLocation(bike);
             bike.setHeartDate(DateUtil.getDateFromLocalDateTime(m.getDeviceTime()));
             if(m.getAttributes()!=null ){
                 Battery battery= (Battery) m.getAttributes().get(AttributeKey.Battery);
@@ -375,6 +376,15 @@
         }
     }
 
+    private void updateMapLocation(Bikes bike) {
+        if(bike.getLatitude() == null || bike.getLongitude() == null){
+            return;
+        }
+        PositionUtil.AMap aMap =PositionUtil.transform(bike.getLongitude().doubleValue() ,bike.getLatitude().doubleValue());
+        bike.setLatitude(new BigDecimal(aMap.getLatitude()));
+        bike.setLongitude(new BigDecimal(aMap.getLongitude()));
+    }
+
     public ConcurrentMap<String,Integer> cacheOpenLock = new ConcurrentReferenceHashMap<>();
 
 

--
Gitblit v1.9.3