diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/contant/AmapConfigConstant.java b/online-taxi-public/internal-common/src/main/java/com/internal/contant/AmapConfigConstant.java index 47ce5df..fe6d77a 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/contant/AmapConfigConstant.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/contant/AmapConfigConstant.java @@ -32,4 +32,8 @@ public class AmapConfigConstant { * 轨迹点上传 */ public static final String POINT_UPLOAD_MAP_ADD_URL = "https://tsapi.amap.com/v1/track/point/upload"; + /** + * 周边搜索终端 + */ + public static final String TERMINAL_AROUND_SEARCH_URL = "https://tsapi.amap.com/v1/track/terminal/aroundsearch"; } 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 new file mode 100644 index 0000000..1539d49 --- /dev/null +++ b/online-taxi-public/internal-common/src/main/java/com/internal/dto/TerminalAroundSearch.java @@ -0,0 +1,36 @@ +package com.internal.dto; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class TerminalAroundSearch { + + /** + * { + * "createtime": 1683779426299, + * "desc": "1656517091884187650", + * "locatetime": 1683799295000, + * "location": { + * "accuracy": 550.0, + * "direction": 511.0, + * "distance": 0, + * "height": null, + * "latitude": 39.90923, + * "longitude": 116.397428, + * "speed": 255.0, + * "trackProps": null + * }, + * "name": "京N86555", + * "props": null, + * "tid": 686521656 + * } + */ + + private String desc; + private String tid; + 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 d23240d..d4c155e 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 @@ -18,4 +18,10 @@ public class TerminalController { return terminalService.addTerminal(name,desc); } + + @PostMapping("/aroundsearch") + 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 ca14ebc..93c3773 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 @@ -2,8 +2,9 @@ package com.taxi.servicemap.remote; import com.internal.contant.AmapConfigConstant; import com.internal.dto.ResponseResult; -import com.internal.dto.ServiceMapResponse; +import com.internal.dto.TerminalAroundSearch; import com.internal.dto.TerminalResponse; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -11,6 +12,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; +import java.util.List; + @Service public class TerminalClient { @Value("${amap.key}") @@ -22,15 +25,50 @@ public class TerminalClient { @Autowired private RestTemplate restTemplate; + + /** + * https://lbs.amap.com/api/track/lieying-kaifa/api/terminal_search + * 周边搜索终端 + * @param center + * @param radius + * @return + */ + public ResponseResult aroundsearch(String center,Integer radius){ + //拼接请求的URL + StringBuilder url = new StringBuilder(); + url.append(AmapConfigConstant.TERMINAL_AROUND_SEARCH_URL); + url.append("?"); + url.append("key="+amapKey); + url.append("&"); + url.append("sid="+sid); + url.append("&"); + url.append("center="+center); + url.append("&"); + url.append("radius="+radius); + + System.out.println("周边搜索终端URL"+url.toString()); + ResponseEntity forEntity = + restTemplate.postForEntity(url.toString(),null,String.class); + String bodyStr = forEntity.getBody(); + JSONObject result = JSONObject.fromObject(bodyStr); + System.out.println("周边搜索终端的结果:"+bodyStr); + 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()); + } + + + return ResponseResult.success(); + } + + /** - * { - * "code": 1, - * "message": "success", - * "data": { - * "tid": "685651163" - * } - * } + * * @param name + * @param desc * @return */ public ResponseResult addTerminal(String name,String desc){ 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 b4ca836..2215cf1 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 @@ -14,4 +14,8 @@ public class TerminalService { public ResponseResult addTerminal(String name,String desc){ return terminalClient.addTerminal(name,desc); } + + public ResponseResult aroundsearch(String center,Integer radius){ + return terminalClient.aroundsearch(center,radius); + } } diff --git a/online-taxi-public/service-map/src/main/resources/application.yaml b/online-taxi-public/service-map/src/main/resources/application.yaml index 7cdcc88..b4dfd94 100644 --- a/online-taxi-public/service-map/src/main/resources/application.yaml +++ b/online-taxi-public/service-map/src/main/resources/application.yaml @@ -15,5 +15,5 @@ spring: name: service-map amap: - key: + key: 01d85ea8f7db65efc370cfec18ff6397 sid: 936137 \ No newline at end of file