From c15224eb51d76dda6e2bfbdb2ae3df039e038ef9 Mon Sep 17 00:00:00 2001 From: topsun Date: Thu, 11 May 2023 15:41:52 +0800 Subject: [PATCH] =?UTF-8?q?=20service-map=E9=9B=86=E6=88=90=E7=BB=88?= =?UTF-8?q?=E7=AB=AF=E6=90=9C=E7=B4=A2=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/dto/TerminalAroundSearch.java | 2 +- .../controller/TerminalController.java | 5 ++++- .../servicemap/remote/TerminalClient.java | 19 ++++++++++++------- .../servicemap/service/TerminalService.java | 5 ++++- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/dto/TerminalAroundSearch.java b/online-taxi-public/internal-common/src/main/java/com/internal/dto/TerminalAroundSearch.java index 1539d49..d1e2088 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/dto/TerminalAroundSearch.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/dto/TerminalAroundSearch.java @@ -28,8 +28,8 @@ public class TerminalAroundSearch { * } */ - private String desc; private String tid; + private Long carId; private String name; private LocalDateTime locatetime; private LocalDateTime createtime; diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TerminalController.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TerminalController.java index d4c155e..ce583a8 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TerminalController.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/controller/TerminalController.java @@ -1,6 +1,7 @@ package com.taxi.servicemap.controller; import com.internal.dto.ResponseResult; +import com.internal.dto.TerminalAroundSearch; import com.internal.dto.TerminalResponse; import com.taxi.servicemap.service.TerminalService; import org.springframework.beans.factory.annotation.Autowired; @@ -8,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("/terminal") public class TerminalController { @@ -20,7 +23,7 @@ public class TerminalController { @PostMapping("/aroundsearch") - public ResponseResult aroundsearch(String center,Integer radius){ + public ResponseResult> aroundsearch(String center, Integer radius){ return terminalService.aroundsearch(center,radius); } diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TerminalClient.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TerminalClient.java index 93c3773..a6adf0f 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TerminalClient.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/remote/TerminalClient.java @@ -12,6 +12,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; +import java.util.ArrayList; import java.util.List; @Service @@ -33,7 +34,7 @@ public class TerminalClient { * @param radius * @return */ - public ResponseResult aroundsearch(String center,Integer radius){ + public ResponseResult> aroundsearch(String center,Integer radius){ //拼接请求的URL StringBuilder url = new StringBuilder(); url.append(AmapConfigConstant.TERMINAL_AROUND_SEARCH_URL); @@ -52,15 +53,19 @@ public class TerminalClient { String bodyStr = forEntity.getBody(); JSONObject result = JSONObject.fromObject(bodyStr); System.out.println("周边搜索终端的结果："+bodyStr); + List list = new ArrayList<>(); if(result.has("data")){ JSONObject data = result.getJSONObject("data"); -// int count = data.getInt("count"); - TerminalAroundSearch terminalAroundSearch = new TerminalAroundSearch(); - List jsonArray = data.getJSONArray("results"); - ResponseResult.success(ResponseResult.success()); + JSONArray jsonArray = data.getJSONArray("results"); + for (int index = 0 ;index < jsonArray.size();index++){ + JSONObject jsonObject = jsonArray.getJSONObject(index); + TerminalAroundSearch terminalAroundSearch = new TerminalAroundSearch(); + terminalAroundSearch.setTid(jsonObject.getString("tid")); + terminalAroundSearch.setCarId(jsonObject.getLong("desc")); + list.add(terminalAroundSearch); + } + return ResponseResult.success(list); } - - return ResponseResult.success(); } diff --git a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TerminalService.java b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TerminalService.java index 2215cf1..052d14f 100644 --- a/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TerminalService.java +++ b/online-taxi-public/service-map/src/main/java/com/taxi/servicemap/service/TerminalService.java @@ -1,11 +1,14 @@ package com.taxi.servicemap.service; import com.internal.dto.ResponseResult; +import com.internal.dto.TerminalAroundSearch; import com.internal.dto.TerminalResponse; import com.taxi.servicemap.remote.TerminalClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class TerminalService { @Autowired @@ -15,7 +18,7 @@ public class TerminalService { return terminalClient.addTerminal(name,desc); } - public ResponseResult aroundsearch(String center,Integer radius){ + public ResponseResult> aroundsearch(String center, Integer radius){ return terminalClient.aroundsearch(center,radius); } }