From b1aa3a40e6ba7d4591df50c679a2fa9aabf81759 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 五月 2026 15:56:07 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 35 +++++++++++++++++------------------
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java | 1 +
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java | 6 ++++--
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
index 22d0907..13418e9 100644
--- a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
+++ b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
@@ -441,6 +441,7 @@
RtTripInfo rtTripInfo = systemRuntimeStatus.getRunningOrderStatusInfo().getRtTripInfo();
if (null != orderId && !order_id.contains("XU")) {
PushOrderRouteDTO dto = new PushOrderRouteDTO();
+ dto.setMessageType(PushMessageTypeEnum.ORDER_ROUTE.getDesc());
dto.setOrderId(orderId);
dto.setRouteType(1);
dto.setLongitude(longitude);
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index ff8ab49..2e17420 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -1877,8 +1877,7 @@
BaseVehicleUserDto baseVehicleUserDto = userVehicleClient.cancelTaxiPassenger(cancelTaxiPassengerVo);
if (baseVehicleUserDto == null) {
- // TODO 本地无法调通
-// throw new RuntimeException("取消订单失败");
+ throw new RuntimeException("取消订单失败");
}
//还原车辆状态
@@ -1889,24 +1888,24 @@
xpVehicleClient.updateVehicleById(vehicle1);
log.info("用户取消订单，车辆状态修改0 {}", xpVehicle.getPlateNumber());
}
+
+ //删除蓝牙秘钥
+ String token = redisService.getCacheObject("rt:bluetooth:unlock:order:" + order.getId());
+ if (StringUtils.isNotBlank(token)) {
+ redisService.deleteObject("rt:bluetooth:unlock:" + token);
+ redisService.deleteObject("rt:bluetooth:unlock:order:" + order.getId());
+ BluetoothDeliverVo vo = new BluetoothDeliverVo();
+ vo.setCredential(token);
+ vo.setVin(xpVehicle.getVehicleVin());
+ vo.setPassengerUid(order.getAppUserId());
+ BaseVehicleUserDto delete = bluetoothUnlockClient.delete(vo);
+ if (null == delete || delete.getCode() != 0) {
+ log.error("删除蓝牙解锁失败：{} {}", delete.getMsg(), order.getOrderNumber());
+ }
+ }
+
//车辆继续巡游
addCruiseMission(order, status);
- }
-
- //删除蓝牙秘钥
- String token = redisService.getCacheObject("rt:bluetooth:unlock:order:" + order.getId());
- if (StringUtils.isNotBlank(token)) {
- redisService.deleteObject("rt:bluetooth:unlock:" + token);
- redisService.deleteObject("rt:bluetooth:unlock:order:" + order.getId());
- XpVehicle xpVehicle = xpVehicleClient.queryById(order.getVehicleId()).getData();
- BluetoothDeliverVo vo = new BluetoothDeliverVo();
- vo.setCredential(token);
- vo.setVin(xpVehicle.getVehicleVin());
- vo.setPassengerUid(order.getAppUserId());
- BaseVehicleUserDto delete = bluetoothUnlockClient.delete(vo);
- if (null == delete || delete.getCode() != 0) {
- log.error("删除蓝牙解锁失败：{} {}", delete.getMsg(), order.getOrderNumber());
- }
}
}else{
//流量接入-订单推送 推送取消订单
diff --git a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
index fb1f205..a9f5ae1 100644
--- a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
+++ b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java
@@ -48,6 +48,7 @@
import com.xiaopeng.api.vo.vehicleConvoy.*;
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.core.enums.PushMessageTypeEnum;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.exception.base.BaseException;
import com.xiaopeng.common.core.utils.GeodesyUtil;
@@ -1440,7 +1441,7 @@
}
log.info("同步查询车辆空调状态成功，开始等到查询回调结果");
try {
- Thread.sleep(2000);
+ Thread.sleep(5000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
@@ -1510,7 +1511,7 @@
}
log.info("同步查询车辆空调状态成功，开始等到查询回调结果");
try {
- Thread.sleep(2000);
+ Thread.sleep(5000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
@@ -1632,6 +1633,7 @@
//调用推送服务接口，给乘客推送剩余轨迹和里程时长
if (null != orderId) {
PushOrderRouteDTO dto1 = new PushOrderRouteDTO();
+ dto1.setMessageType(PushMessageTypeEnum.ORDER_ROUTE.getDesc());
dto1.setOrderId(orderId);
dto1.setRouteType(1);
dto1.setLongitude(longitude);
--
Gitblit v1.7.1