From 560be817c1342d4da523760ba38433c4c0f52983 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 五月 2026 10:56:09 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.1

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/map/XpMapClient.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 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 483b9b0..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,6 @@
 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;
@@ -14,6 +15,8 @@
 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 {
     /**
@@ -21,15 +24,24 @@
      * @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/mini-program/map/getOrderDistanceAndDuration")
+    @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);
 
 
@@ -38,8 +50,9 @@
      * @param routedID
      * @return
      */
-    @PostMapping("/base/v1/mini-program/map/queryRouted")
+    @PostMapping("/base/v1/map/queryRouted")
     R<String> queryRouted(@RequestParam("routedID") String routedID);
+
 
 
 
@@ -48,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