From e00bb855b266c7eec9499ba06aa78ea22dcec257 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 06 三月 2026 16:47:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpCruisePlanClient.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpCruisePlanClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpCruisePlanClient.java
index 79aae39..8680fd7 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpCruisePlanClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpCruisePlanClient.java
@@ -6,9 +6,7 @@
 import com.xiaopeng.api.dto.order.HistoryStartPointsDto;
 import com.xiaopeng.api.factory.operation.XpCruisePlanClientFallbackFactory;
 import com.xiaopeng.api.factory.operation.XpPointClientFallbackFactory;
-import com.xiaopeng.api.model.operation.XpCruisePlanPoint;
-import com.xiaopeng.api.model.operation.XpElectronicFenceArea;
-import com.xiaopeng.api.model.operation.XpPoint;
+import com.xiaopeng.api.model.operation.*;
 import com.xiaopeng.api.model.order.XpCruiseOrder;
 import com.xiaopeng.api.query.operation.PointListQuery;
 import com.xiaopeng.api.query.operation.PointPageListListQuery;
@@ -43,5 +41,24 @@
      * @return
      */
     @PostMapping("/inner/cruise/getNewCruiseOrder")
-    R<XpCruiseOrder>  getNewCruiseOrder(@RequestParam Long vehicleId);
+    R<XpCruiseOrder>  getNewCruiseOrder(@RequestBody NewCruiseOrderDto dto);
+
+    /**
+     * 找到收车点位
+     * @return
+     */
+    @PostMapping("/inner/cruise/findReturnCruisePoint")
+    R<XpCruiseOrder> findReturnCruisePoint(@RequestBody XpCruiseOrder xpCruiseOrder);
+
+
+    /**
+     * 获取巡游计划
+     * @param vehicleId
+     * @return
+     */
+    @PostMapping("/inner/cruise/getCruisePlan")
+    R<XpCruisePlanVehicle> getCruisePlan(@RequestParam Long vehicleId);
+
+
+
 }

--
Gitblit v1.7.1