From b47d0a82c805d1e42aa31866f999f73c9a321eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=B8=E8=83=9C=E6=8C=AF?= <449117895@qq.com>
Date: Fri, 26 Jul 2024 17:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=80=E6=96=B0=E8=B7=AF?=
 =?UTF-8?q?=E6=AE=B5=E3=80=81=E8=B7=AF=E5=8F=A3-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hiatmp/server_api/controller/HighDangerController.java   | 5 ++---
 .../src/main/java/com/hisense/hiatmp/model/dmr/Point.java    | 1 +
 2 files changed, 3 insertions(+), 3 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 a012fc5..c6ef800 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
@@ -197,7 +197,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
     ) {
 
@@ -210,7 +209,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<SectionVO> allRoadInfo = highDangerMapper.getAllSection(sectionVO);
 //        List<SectionVO> allRoadInfo = highDangerMapper.getAllSection(sectionVO);
         List<HashMap<String, Object>> combinedMap = new LinkedList<>();
@@ -315,7 +314,7 @@ public class HighDangerController {
         crossingDTO.setLatMin(rectangle[1]);
         crossingDTO.setLonMax(rectangle[2]);
         crossingDTO.setLatMax(rectangle[3]);
-        crossingDTO.setSearch(search);
+        crossingDTO.setSearch(point.getSearch());
         List<CrossingDTO> allCrossing = highDangerMapper.getAllCrossing(crossingDTO);
 //        List<CrossingDTO> 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;
 }