From bb60f152e4c4cf4abd81df31aa77c927cdd9e19a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 09 四月 2026 15:52:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/GDMapGeocodingUtil.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 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 6fecbc9..5d2e8d8 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
+import com.xiaopeng.api.dto.map.HistoryPointDto;
import com.xiaopeng.api.dto.operation.LonLatDto;
import com.xiaopeng.api.vo.operation.RouteVo;
import com.xiaopeng.common.core.utils.HttpUtils;
@@ -47,7 +48,7 @@
* @return
* @throws Exception
*/
- public RouteVo getDistanceAndTime(LonLatDto start, LonLatDto end,String avoidRoads,String fenceId,Integer routePlanRule) {
+ public RouteVo getDistanceAndTime(LonLatDto start, LonLatDto end,String 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();
@@ -62,6 +63,9 @@
if(routePlanRule!=null){
params.put("strategy", routePlanRule);
}
+ if(null != history && !history.isEmpty()){
+ params.put("history", history);
+ }
log.info("高德地图接口：{}", url);
log.info("高德地图参数：{}", params);
String post = HttpUtils.post(url, JSON.toJSONString(params));
@@ -77,6 +81,45 @@
JSONObject jsonObject2 = (JSONObject) o;
String routeID = jsonObject2.getString("routeID");
String points = jsonObject2.getString("points");
+ String label = jsonObject2.getString("label");
+ if(label.contains("大众常选")){
+ String[] split = points.split(";");
+ List<LonLatDto> pointsArray = new ArrayList<>();
+ for (int i = 0; i < split.length; i++) {
+ if((i % 2) == 0){
+ String[] split1 = split[i].split(",");
+ LonLatDto lonLatDto = new LonLatDto(Double.parseDouble(split1[0]), Double.parseDouble(split1[1]));
+ pointsArray.add(lonLatDto);
+ }
+ }
+ ForkJoinPool pool = new ForkJoinPool(); // 创建ForkJoinPool对象（默认使用处理器的核心数作为线程池大小）
+ ArrayPointsTask arrayPointsTask = new ArrayPointsTask(pointsArray, fenceId); // 创建求和任务对象并传入数组作为参数（这里也可以传入数组的一部分作为参数来实现更细粒度的拆分）
+ Long temp = pool.invoke(arrayPointsTask); // 提交任务并等待处理完成（也可以使用submit方法提交任务并获取一个Future对象来异步获取结果）
+ pool.shutdown(); // 关闭ForkJoinPool（释放资源）
+ if(temp==0){
+ Integer costTime = jsonObject2.getInteger("costTime");
+ Integer distance = jsonObject2.getInteger("distance");
+ routeVo.setDistance(distance);
+ routeVo.setDuration(costTime);
+ ArrayList<LonLatDto> lonLatDtos = new ArrayList<>(split.length);
+ for (String s : split) {
+ String[] split1 = s.split(",");
+ LonLatDto lonLatDto = new LonLatDto(Double.parseDouble(split1[0]), Double.parseDouble(split1[1]));
+ lonLatDtos.add(lonLatDto);
+ }
+ routeVo.setPolyline(lonLatDtos);
+ routeVo.setRouteID(routeID);
+ log.info("导航 {} 在 {} 运营区域内", routeVo.getRouteID(), fenceId);
+ return routeVo;
+ }
+ }
+
+ }
+
+ for (Object o : path) {
+ JSONObject jsonObject2 = (JSONObject) o;
+ String routeID = jsonObject2.getString("routeID");
+ String points = jsonObject2.getString("points");
String[] split = points.split(";");
List<LonLatDto> pointsArray = new ArrayList<>();
for (int i = 0; i < split.length; i++) {
--
Gitblit v1.7.1