修改配置

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<>();
+                Map<String,Double> pointMap = new LinkedHashMap<>();
-                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);
 
                 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<>();
+            Map<String,Double> pointMap = new HashMap<>();
-            LinkedList<Map<String, Float>> pointList = new LinkedList<>();
+            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);
-
+            CoordinateConverter.AMap aMap = CoordinateConverter.transform(x, y);
-            pointMap.put("longitude", x);
+            pointMap.put("longitude", aMap.getLongitude());
-            pointMap.put("latitude", y);
+            pointMap.put("latitude", aMap.getLatitude());
             pointList.add(pointMap);
             pointMapCrossing.put("distance", (int) Math.ceil(pointDistance));
             pointMapCrossing.put("position", pointList);