From 08cc6d5cf7e93b75cfabe7dcc2aeaa9afa1117eb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 五月 2026 15:01:47 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.1
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpCruisePlanClient.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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..bd4313b 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;
@@ -34,7 +32,7 @@
* 获取车辆下个点位
* @return
*/
- @PostMapping("/inner/cruise/getCruisePoint")
+ @PostMapping("/logan/inner/cruise/getCruisePoint")
R<XpCruiseOrder> getCruisePoint(@RequestBody CruisePointDto dto);
@@ -42,6 +40,44 @@
* 组装巡游单子
* @return
*/
- @PostMapping("/inner/cruise/getNewCruiseOrder")
- R<XpCruiseOrder> getNewCruiseOrder(@RequestParam Long vehicleId);
+ @PostMapping("/logan/inner/cruise/getNewCruiseOrder")
+ R<XpCruiseOrder> getNewCruiseOrder(@RequestBody NewCruiseOrderDto dto);
+
+ /**
+ * 找到收车点位
+ * @return
+ */
+ @PostMapping("/logan/inner/cruise/findReturnCruisePoint")
+ R<XpCruiseOrder> findReturnCruisePoint(@RequestBody XpCruiseOrder xpCruiseOrder);
+
+
+ /**
+ * 获取巡游计划
+ * @param vehicleId
+ * @return
+ */
+ @PostMapping("/logan/inner/cruise/getCruisePlan")
+ R<XpCruisePlanVehicle> getCruisePlan(@RequestParam Long vehicleId);
+
+ /**
+ * 获取巡游计划点位列表
+ * @param vehicleId
+ * @return
+ */
+ @PostMapping("/logan/inner/cruise/getCruisePlanPointList")
+ R<List<XpCruisePlanPoint>> getCruisePlanPointList(@RequestParam Long vehicleId);
+
+
+
+ /**
+ * 判断点位ID列表是否存在关联的巡游计划点位
+ *
+ * @param pointIds 点位ID列表
+ * @return 是否存在关联
+ */
+ @PostMapping("/logan/inner/cruise/existsCruisePlanPointByPointIds")
+ R<Boolean> existsCruisePlanPointByPointIds(@RequestBody List<Long> pointIds);
+
+
+
}
--
Gitblit v1.7.1