From 2862d5229b2564b45face7c6ec3d3e3acccc1749 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 四月 2026 18:30:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/map/XpMapClient.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/map/XpMapClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/map/XpMapClient.java
index 11414e5..4955cd1 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/map/XpMapClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/map/XpMapClient.java
@@ -1,5 +1,6 @@
 package com.xiaopeng.api.feignClient.map;
 
+import com.xiaopeng.api.dto.map.OrderRouteAndFareDto;
 import com.xiaopeng.api.dto.map.RouteAndFareDto;
 import com.xiaopeng.api.factory.map.XpMapClientFallbackFactory;
 import com.xiaopeng.api.factory.operation.XpSystemSettingClientFallbackFactory;
@@ -11,6 +12,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(contextId = "XpMapClient", value = ServiceNameConstantsEnum.XP_MAP_SERVICE, fallbackFactory = XpMapClientFallbackFactory.class)
 public interface XpMapClient {
@@ -19,8 +21,26 @@
      * @param dto
      * @return
      */
-    @PostMapping("/base/v1/mini-program/map/getDistanceAndDuration")
+    @PostMapping("/base/v1/map/getDistanceAndDuration")
     R<RouteVo> getDistanceAndDuration(@RequestBody RouteAndFareDto dto);
+
+    /**
+     * 获取距离和时长
+     * @param dto
+     * @return
+     */
+    @PostMapping("/base/v1/map/getOrderDistanceAndDuration")
+    R<RouteVo> getOrderDistanceAndDuration(@RequestBody OrderRouteAndFareDto dto);
+
+
+    /**
+     * 根据导航ID获取车端需要的导航数据
+     * @param routedID
+     * @return
+     */
+    @PostMapping("/base/v1/map/queryRouted")
+    R<String> queryRouted(@RequestParam("routedID") String routedID);
+
 
 
 
@@ -29,7 +49,7 @@
      * @param dto
      * @return
      */
-    @PostMapping("/base/v1/mini-program/fence/diagnosisArea")
+    @PostMapping("/base/v1/fence/diagnosisArea")
     R<Boolean> diagnosisArea(@RequestBody RouteAndFareDto dto);
 
 

--
Gitblit v1.7.1