From b3d1411517baca17d92dcfe3a0933cdc342b3145 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 16 五月 2026 11:52:41 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/map/XpMapClient.java |   44 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 40 insertions(+), 4 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 45f77d0..0ec3da1 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,7 @@
 package com.xiaopeng.api.feignClient.map;
 
+import com.xiaopeng.api.dto.WeatherDTO;
+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,17 +13,47 @@
 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;
+
+import java.util.List;
 
 @FeignClient(contextId = "XpMapClient", value = ServiceNameConstantsEnum.XP_MAP_SERVICE, fallbackFactory = XpMapClientFallbackFactory.class)
 public interface XpMapClient {
+    /**
+     * 获取距离和时长
+     * @param dto
+     * @return
+     */
+    @PostMapping("/base/v1/map/getDistanceAndDuration")
+    R<RouteVo> getDistanceAndDuration(@RequestBody RouteAndFareDto dto);
+
 
     /**
      * 获取距离和时长
      * @param dto
      * @return
      */
-    @PostMapping("/base/v1/mini-program/map/getDistanceAndDuration")
-    R<RouteVo> getDistanceAndDuration(@RequestBody RouteAndFareDto dto);
+    @PostMapping("/base/v1/map/getDistanceAndDurationList")
+    R<List<RouteVo>> getDistanceAndDurationList(@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,9 +61,13 @@
      * @param dto
      * @return
      */
-    @PostMapping("/base/v1/mini-program/fence/diagnosisArea")
+    @PostMapping("/base/v1/fence/diagnosisArea")
     R<Boolean> diagnosisArea(@RequestBody RouteAndFareDto dto);
 
 
-
+    /**
+     * 获取指定城市的天气
+     */
+    @PostMapping("/logan/inner/weatherInfo")
+    R<WeatherDTO> wether(@RequestParam("cityCode") String cityCode);
 }

--
Gitblit v1.7.1