From 2b16a4c512804ed48825d272a996f0d31eb3d1a3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 07 三月 2026 21:00:34 +0800
Subject: [PATCH] 修改部分bug,优化XPU下单点位数据补充
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCruisePlanController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCruisePlanController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCruisePlanController.java
index 76e66ec..6679c50 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCruisePlanController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCruisePlanController.java
@@ -102,6 +102,9 @@
public R<XpCruiseOrder> getCruisePoint(@RequestBody CruisePointDto dto) {
// 先找计划
XpCruisePlanVehicle plan = xpCruisePlanVehicleService.getOne(new LambdaQueryWrapper<XpCruisePlanVehicle>().eq(XpCruisePlanVehicle::getVehicleId, dto.getVehicleId()));
+ if (plan == null) {
+ return R.fail("没有找到对应的计划");
+ }
// 找对应的多个点位
List<XpCruisePlanPoint> planPointList = xpCruisePlanPointService.list(new LambdaQueryWrapper<XpCruisePlanPoint>().eq(XpCruisePlanPoint::getCruisePlanId, plan.getCruisePlanId()).orderByAsc(XpCruisePlanPoint::getSortOrder));
// 找到现在这个点位
@@ -149,6 +152,16 @@
return R.ok(newXpCruiseOrder);
}
+ /**
+ * 获取巡游计划
+ * @param vehicleId
+ * @return
+ */
+ @PostMapping("/inner/cruise/getCruisePlan")
+ public R<XpCruisePlanVehicle> getCruisePlan(@RequestParam Long vehicleId) {
+ XpCruisePlanVehicle plan = xpCruisePlanVehicleService.getOne(new LambdaQueryWrapper<XpCruisePlanVehicle>().eq(XpCruisePlanVehicle::getVehicleId, vehicleId));
+ return R.ok(plan);
+ }
/**
* 获取巡游订单数据
@@ -167,7 +180,7 @@
Long pointId = xpCruisePlanPoint.getPointId();
XpPoint point = pointService.getById(pointId);
XpCruiseOrder newXpCruiseOrder = new XpCruiseOrder();
- newXpCruiseOrder.setId("XU"+ IdUtil.fastUUID());
+ newXpCruiseOrder.setId("XU" + IdUtil.fastUUID());
newXpCruiseOrder.setFleetId(dto.getFleetId());
newXpCruiseOrder.setVehicleId(dto.getVehicleId());
newXpCruiseOrder.setVehicleVin(dto.getVehicleVin());
@@ -203,7 +216,7 @@
* @return
*/
@PostMapping("/inner/cruise/findReturnCruisePoint")
- public R<XpCruiseOrder> findReturnCruisePoint(@RequestBody XpCruiseOrder xpCruiseOrder){
+ public R<XpCruiseOrder> findReturnCruisePoint(@RequestBody XpCruiseOrder xpCruiseOrder) {
// 先找计划
XpCruisePlanVehicle plan = xpCruisePlanVehicleService.getOne(new LambdaQueryWrapper<XpCruisePlanVehicle>().eq(XpCruisePlanVehicle::getVehicleId, xpCruiseOrder.getVehicleId()));
// 找对应的多个点位
--
Gitblit v1.7.1