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 4c05667..6ffdee5 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 @@ -215,7 +215,6 @@ public class HighDangerController { public ServerResponse getNearRoad(@RequestBody Point point, @RequestParam(defaultValue = "1") Long pageNum, @RequestParam(defaultValue = "10") Long pageSize, - @RequestParam(defaultValue = "") String search, HttpServletRequest request ) { @@ -228,7 +227,7 @@ public class HighDangerController { BigDecimal d = new BigDecimal(point.getX()).setScale(1, BigDecimal.ROUND_DOWN); SectionVO sectionVO = new SectionVO(); sectionVO.setPosition(String.valueOf(d)); - sectionVO.setSearch(search); + sectionVO.setSearch(point.getSearch()); List allRoadInfo = highDangerMapper.getAllSection(sectionVO); // List allRoadInfo = highDangerMapper.getAllSection(sectionVO); List> combinedMap = new LinkedList<>(); @@ -333,7 +332,7 @@ public class HighDangerController { crossingDTO.setLatMin(rectangle[1]); crossingDTO.setLonMax(rectangle[2]); crossingDTO.setLatMax(rectangle[3]); - crossingDTO.setSearch(search); + crossingDTO.setSearch(point.getSearch()); List allCrossing = highDangerMapper.getAllCrossing(crossingDTO); // List allCrossing = highDangerMapper.getAllCrossing(crossingDTO); // 遍历集合,将所有坐标点与当前坐标比较 diff --git a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/dmr/Point.java b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/dmr/Point.java index e4203be..3906cb3 100644 --- a/hiatmp-model/src/main/java/com/hisense/hiatmp/model/dmr/Point.java +++ b/hiatmp-model/src/main/java/com/hisense/hiatmp/model/dmr/Point.java @@ -6,4 +6,5 @@ import lombok.Data; public class Point { private float x; private float y; + private String search; }