From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/GDMapGeocodingUtil.java | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/GDMapGeocodingUtil.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/GDMapGeocodingUtil.java
index 89118b7..e2a1925 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/GDMapGeocodingUtil.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/GDMapGeocodingUtil.java
@@ -7,10 +7,10 @@
import com.xiaopeng.api.dto.operation.LonLatDto;
import com.xiaopeng.api.vo.operation.RouteVo;
import com.xiaopeng.common.core.utils.HttpUtils;
+import com.xiaopeng.map.config.MapApiProperties;
import com.xiaopeng.map.mangodb.service.XpGeoFencingPolygonService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
@@ -29,11 +29,12 @@
@Lazy
public class GDMapGeocodingUtil {
- private String key = "66ae577f63898dae3016d599fda57221";
-
@Autowired
private XpGeoFencingPolygonService xpGeoFencingPolygonService;
+
+ @Autowired
+ private MapApiProperties mapApiProperties;
/**
@@ -50,7 +51,7 @@
public RouteVo getDistanceAndTime(LonLatDto start, LonLatDto end,ArrayList<JSONObject> avoidRoads,String fenceId,Integer routePlanRule, List<HistoryPointDto> history) {
RouteVo routeVo = new RouteVo();
- String url = "https://tsapi.amap.com/v1/route/price?key=" + key + "&extensions=all&start=" + start.getLongitude() + "," + start.getLatitude();
+ String url = mapApiProperties.getUrls().getRoutePrice() + "?key=" + mapApiProperties.getApiKey() + "&extensions=all&start=" + start.getLongitude() + "," + start.getLatitude();
HashMap<String, Object> params = new HashMap<>();
params.put("extensions", "all");
params.put("start", start.getLongitude() + "," + start.getLatitude());
@@ -166,7 +167,7 @@
* @throws Exception
*/
public List<RouteVo> getDistanceAndTimeList(LonLatDto start, LonLatDto end,ArrayList<JSONObject> avoidRoads,String fenceId,Integer routePlanRule, List<HistoryPointDto> history) {
- String url = "https://tsapi.amap.com/v1/route/price?key=" + key + "&extensions=all&start=" + start.getLongitude() + "," + start.getLatitude();
+ String url = mapApiProperties.getUrls().getRoutePrice() + "?key=" + mapApiProperties.getApiKey() + "&extensions=all&start=" + start.getLongitude() + "," + start.getLatitude();
HashMap<String, Object> params = new HashMap<>();
params.put("extensions", "all");
params.put("start", start.getLongitude() + "," + start.getLatitude());
@@ -232,22 +233,6 @@
}
- public static void main(String[] args) {
- String url = "https://tsapi.amap.com/v1/route/price?key=" + "66ae577f63898dae3016d599fda57221" + "&extensions=all&start=" + "113.384932" + "," + "23.155455";
- HashMap<String, Object> params = new HashMap<>();
- params.put("extensions", "all");
- params.put("start", "113.384932" + "," + "23.155455");
- params.put("end", "113.388209" + "," + "23.163455");
- params.put("routeUserType", 2);
- log.info("高德地图接口：{}", url);
- log.info("高德地图参数：{}", params);
- String post = HttpUtils.post(url, JSON.toJSONString(params));
- log.info("高德地图返回结果：" + post);
- JSONObject jsonObject = JSON.parseObject(post);
- System.out.println(jsonObject);
- }
-
-
class ArrayPointsTask extends RecursiveTask<Long> {
//最大定位集合阈值
private final int THRESHOLD = 10;
@@ -293,7 +278,7 @@
* @return
*/
public String routed(String routeID) {
- String url = "https://tsapi.amap.com/v1/route/query/routeid?key=" + key;
+ String url = mapApiProperties.getUrls().getRouteQuery() + "?key=" + mapApiProperties.getApiKey();
HashMap<String, Object> params = new HashMap<>();
params.put("routeID", routeID);
params.put("sdkVersion", "9.850.152.3.532");
@@ -314,7 +299,7 @@
* @throws Exception
*/
public Map<String, String> geocode(String lon, String lan) {
- String url = "https://restapi.amap.com/v3/geocode/regeo?key=" + key + "&location=" + lon + "," + lan;
+ String url = mapApiProperties.getUrls().getReverseGeocode() + "?key=" + mapApiProperties.getApiKey() + "&location=" + lon + "," + lan;
String forObject = HttpUtils.sendGet(url);
JSONObject jsonObject = JSON.parseObject(forObject);
Map<String, String> map = new HashMap<>();
--
Gitblit v1.7.1