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 pointMapSection = new HashMap<>(); // Map map = new HashMap<>(); - LinkedList> pointList = new LinkedList<>(); + LinkedList> 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 pointMap = new LinkedHashMap<>(); - pointMap.put("longitude", x); - pointMap.put("latitude", y); + Map 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 pointMapCrossing = new HashMap<>(); // Map map = new HashMap<>(); - Map pointMap = new HashMap<>(); - LinkedList> pointList = new LinkedList<>(); + Map pointMap = new HashMap<>(); + LinkedList> 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);