From d706a1779df4d0d744fa6c365683654528ac74ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=B8=E8=83=9C=E6=8C=AF?= <449117895@qq.com>
Date: Thu, 18 Jul 2024 00:58:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HighDangerController.java      | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
index d105c5d..c8aba67 100644
--- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
+++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
@@ -204,7 +204,7 @@ public class HighDangerController {
             HashMap<String, Object> pointMapSection = new HashMap<>();
 //            Map<String,Object> map = new HashMap<>();
 
-            LinkedList<Map<String, Float>> pointList = new LinkedList<>();
+            LinkedList<Map<String, Double>> pointList = new LinkedList<>();
             // 临时存储最短距离
             //Double minDistance = null;
             if(dto.getPosition() == null){
@@ -220,9 +220,12 @@ public class HighDangerController {
                 float x = Float.parseFloat(split[i]);
                 float y = Float.parseFloat(split[i + 1]);
 
-                Map<String,Float> pointMap = new LinkedHashMap<>();
-                pointMap.put("longitude", x);
-                pointMap.put("latitude", y);
+                Map<String,Double> pointMap = new LinkedHashMap<>();
+
+                CoordinateConverter.AMap aMap = CoordinateConverter.transform(x, y);
+                pointMap.put("longitude", aMap.getLongitude());
+                pointMap.put("latitude", aMap.getLatitude());
+
                 pointList.add(pointMap);
 
                 if (!(x >= rectangle[0] && x <= rectangle[2] && y >= rectangle[1] && y <= rectangle[3])){
@@ -300,8 +303,8 @@ public class HighDangerController {
         for(CrossingDTO cross : allCrossing){
             HashMap<String, Object> pointMapCrossing = new HashMap<>();
 //            Map<String,Object> map = new HashMap<>();
-            Map<String,Float> pointMap = new HashMap<>();
-            LinkedList<Map<String, Float>> pointList = new LinkedList<>();
+            Map<String,Double> pointMap = new HashMap<>();
+            LinkedList<Map<String, Double>> pointList = new LinkedList<>();
 
             float x = cross.getLongitude();
             float y = cross.getLatitude();
@@ -312,9 +315,9 @@ public class HighDangerController {
             Dpoint.setY(y);
             // 计算两点间的距离
             Double pointDistance = highDangerService.getPointDistance(Dpoint, point);
-
-            pointMap.put("longitude", x);
-            pointMap.put("latitude", y);
+            CoordinateConverter.AMap aMap = CoordinateConverter.transform(x, y);
+            pointMap.put("longitude", aMap.getLongitude());
+            pointMap.put("latitude", aMap.getLatitude());
             pointList.add(pointMap);
             pointMapCrossing.put("distance", (int) Math.ceil(pointDistance));
             pointMapCrossing.put("position", pointList);