From f7675bda569bf0654b4157613c8ba448ac43c5a8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 三月 2026 17:11:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
index 036fbe6..62dca50 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -783,7 +783,11 @@
continue;
}
// 关闭巡游单子
- xpCruiseOrderClient.updateCruiseOrder(vehiclePosition.getVehicleVin());
+ R<String> stringR = xpCruiseOrderClient.updateCruiseOrder(vehiclePosition.getVehicleVin());
+ if(stringR ==null || stringR.getData()==null){
+ log.info("关闭巡游单子失败");
+ continue;
+ }
// 下发命令
PushOrderDto pushOrderDto = new PushOrderDto();
@@ -829,7 +833,12 @@
continue;
}
// 关闭巡游单子
- xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());
+ R<String> stringR = xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());
+ if(stringR ==null || stringR.getData()==null){
+ log.info("关闭巡游单子失败");
+ continue;
+ }
+
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(vehiclePosition.getVin());
@@ -909,7 +918,11 @@
continue;
}
// 关闭巡游单子
- xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());
+ R<String> stringR = xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());
+ if(stringR ==null || stringR.getData()==null){
+ log.info("关闭巡游单子失败");
+ continue;
+ }
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(vehiclePosition.getVin());
--
Gitblit v1.7.1