From bb1a50cd82b8e8f375041ca79c7856c11f5050ed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 二月 2026 18:50:27 +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/controller/XpMapController.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 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 c7ced20..ceae241 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
@@ -1,11 +1,14 @@
package com.xiaopeng.map.controller;
+import com.xiaopeng.api.dto.map.OrderRouteAndFareDto;
import com.xiaopeng.api.dto.map.RouteAndFareDto;
import com.xiaopeng.api.dto.operation.LonLatDto;
import com.xiaopeng.api.vo.map.XpDistanceAndDurationVo;
import com.xiaopeng.api.vo.operation.RouteVo;
+import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.redis.service.RedisService;
import com.xiaopeng.map.mangodb.model.GeoPoint;
import com.xiaopeng.map.mangodb.service.XpGeoFencingPolygonService;
import com.xiaopeng.map.utils.GDMapGeocodingUtil;
@@ -13,6 +16,7 @@
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,10 +35,12 @@
private final GDMapGeocodingUtil gdMapGeocodingUtil;
private final XpGeoFencingPolygonService xpGeoFencingPolygonService;
+ private final RedisService redisService;
- public XpMapController(GDMapGeocodingUtil gdMapGeocodingUtil, XpGeoFencingPolygonService xpGeoFencingPolygonService) {
+ public XpMapController(GDMapGeocodingUtil gdMapGeocodingUtil, XpGeoFencingPolygonService xpGeoFencingPolygonService, RedisService redisService) {
this.gdMapGeocodingUtil = gdMapGeocodingUtil;
this.xpGeoFencingPolygonService = xpGeoFencingPolygonService;
+ this.redisService = redisService;
}
@@ -72,5 +78,42 @@
}
+ /**
+ * 获取订单距离和时长
+ * @param dto
+ * @return
+ */
+ @PostMapping("/map/getOrderDistanceAndDuration")
+ public R<RouteVo> getOrderDistanceAndDuration(@Validated @RequestBody OrderRouteAndFareDto 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, "parentId", "prohibited_area");
+ // 避让区域
+ ArrayList<String> pointStrParam = new ArrayList<>();
+ for (Document document : pointsInFence) {
+ List<GeoPoint> points = document.getList("points", GeoPoint.class);
+ // 一个区域的点位
+ ArrayList<String> pointStr = new ArrayList<>();
+ for (GeoPoint point : points) {
+ pointStr.add( point.getLongitude()+","+point.getLatitude());
+ }
+ if(!pointStr.isEmpty()){
+ pointStrParam.add(String.join(";", pointStr));
+ }
+ }
+ RouteVo routeVo = gdMapGeocodingUtil.getDistanceAndTime(dto.getOrigin(), dto.getDestination(), String.join("|", pointStrParam), fenceId,dto.getRoutePlanRule());
+ if(routeVo==null){
+ return R.fail("没有找到路线");
+ }
+
+ // 存储redis
+ redisService.setCacheObject(CacheConstants.ORDER_ROUTE + "_" + dto.getOrderId() + "_" +dto.getRouteType(), routeVo);
+
+ return R.ok(routeVo);
+ }
+
+
}
--
Gitblit v1.7.1