From 487ebcc3b2db366ad7bfb6f34bd11f4ffec9e11e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 三月 2026 20:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
index 804cf36..53b5547 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
@@ -116,17 +116,17 @@
xpCruiseOrder.setLastOrderId(r.getData());
// 找到收车站点
- R<XpCruiseOrder> returnCruisePoint = xpCruisePlanClient.findReturnCruisePoint(xpCruiseOrder);
+ XpCruiseOrder returnCruisePoint = xpCruisePlanClient.findReturnCruisePoint(xpCruiseOrder).getData();
if(returnCruisePoint!=null){
- xpCruiseOrderClient.addCruiseOrder(returnCruisePoint.getData());
+ xpCruiseOrderClient.addCruiseOrder(returnCruisePoint);
// 下发命令
PushOrderDto pushOrderDto = new PushOrderDto();
- pushOrderDto.setVin(returnCruisePoint.getData().getVehicleVin());
- pushOrderDto.setOrderId(returnCruisePoint.getData().getId());
- pushOrderDto.setStartLatitude(returnCruisePoint.getData().getStartLat());
- pushOrderDto.setStartLongitude(returnCruisePoint.getData().getStartLon());
- pushOrderDto.setEndLatitude(returnCruisePoint.getData().getEndLat());
- pushOrderDto.setEndLongitude(returnCruisePoint.getData().getEndLon());
+ pushOrderDto.setVin(returnCruisePoint.getVehicleVin());
+ pushOrderDto.setOrderId(returnCruisePoint.getId());
+ pushOrderDto.setStartLatitude(returnCruisePoint.getStartLat());
+ pushOrderDto.setStartLongitude(returnCruisePoint.getStartLon());
+ pushOrderDto.setEndLatitude(returnCruisePoint.getEndLat());
+ pushOrderDto.setEndLongitude(returnCruisePoint.getEndLon());
pushOrderDto.setOrderType(OrderType.CRUISE_ORDER);
pushOrderDto.setStage(2);
orderMissionClient.pushOrder(pushOrderDto);
--
Gitblit v1.7.1