From 0bcfca6b2561d096a2ce26e2e7200cd0768b2b6d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 五月 2026 09:27:03 +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/controller/XpMapController.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
index c501215..dee2018 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
@@ -73,6 +73,71 @@
}
+ @PostMapping("/base/v1/map/getDistanceAndDurationList")
+ public R<List<RouteVo>> getDistanceAndDurationList(@RequestBody RouteAndFareDto dto){
+ // 获取电子围栏的禁行区域点位
+ GeoPoint startPoint = new GeoPoint(dto.getOrigin().getLongitude(),dto.getOrigin().getLatitude());
+ List<String> operatingArea = xpGeoFencingPolygonService.findFencesContainingPoint(startPoint, "operating_area", "points");
+ String fenceId = operatingArea.get(0);
+
+ List<Document> pointsInFence = xpGeoFencingPolygonService.findPointsByParentId(fenceId, "fenceId", "prohibited_area");
+
+ // 避让区域
+ ArrayList<JSONObject> pointStrParam = new ArrayList<>();
+ try {
+ for (Document document : pointsInFence) {
+ // 获取points字段（它是GeoJSON对象）
+ Document geoJsonDoc = document.get("points", Document.class);
+
+ if (geoJsonDoc != null && "Polygon".equals(geoJsonDoc.getString("type"))) {
+ // 获取coordinates数组
+ List<List<List<Double>>> coordinates = (List<List<List<Double>>>) geoJsonDoc.get("coordinates");
+
+ if (coordinates != null && !coordinates.isEmpty()) {
+ // 获取第一个多边形环（通常只有一个）
+ List<List<Double>> polygonPoints = coordinates.get(0);
+ List<String> coordinatesList = new ArrayList<>();
+ // 转换为经纬度字符串
+ for (List<Double> point : polygonPoints) {
+ if (point.size() >= 2) {
+ coordinatesList.add(point.get(0) + "," + point.get(1));
+ }
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("coordinates", coordinatesList);
+ pointStrParam.add(jsonObject);
+ }
+ }
+ }
+
+ List<HistoryPointDto> history = new ArrayList<>();
+ if(null != dto.getVehicleId()){
+// history = redisService.getCacheList("VEHICLE_HISTORY_POINT_LIST:" + dto.getVehicleId());
+// if(history.size() > 10){
+// history = history.subList(history.size() - 10, history.size());
+// }
+// history.forEach(s->{
+// s.setDirection(new BigDecimal(s.getDirection()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+// });
+// redisService.setCacheList("VEHICLE_HISTORY_POINT_LIST:" + dto.getVehicleId(), history);
+ }
+ List<RouteVo> routeVo = gdMapGeocodingUtil.getDistanceAndTimeList(dto.getOrigin(), dto.getDestination(), pointStrParam, fenceId,dto.getRoutePlanRule(), history);
+ if(routeVo==null || routeVo.isEmpty()){
+ return R.fail("没有找到路线");
+ }
+
+ return R.ok(routeVo);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return R.fail("没有找到路线");
+
+
+ }
+
+
+
+
@PostMapping("/base/v1/map/getDistanceAndDuration")
public R<RouteVo> getDistanceAndDuration(@RequestBody RouteAndFareDto dto){
// 获取电子围栏的禁行区域点位
@@ -206,6 +271,7 @@
}
+
@Value("${map.urls.weather:https://restapi.amap.com/v3/weather/weatherInfo?key=%s&city=%s}")
String WEATHER_URL;
@@ -235,4 +301,5 @@
return R.fail("获取天气信息失败");
}
+
}
--
Gitblit v1.7.1