合并线上代码

puzhibing

2026-05-12 1035dbf7311feb166bcc8ad8635c4876fb3a036f

合并线上代码

 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);

 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{
            //流量接入-订单推送 推送取消订单

 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java

@@ -47,6 +47,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;
@@ -1419,7 +1420,7 @@
            }
            log.info("同步查询车辆空调状态成功，开始等到查询回调结果");
            try {
                Thread.sleep(2000);
                Thread.sleep(5000);
            } catch (InterruptedException e) {
                throw new RuntimeException(e);
            }
@@ -1489,7 +1490,7 @@
        }
        log.info("同步查询车辆空调状态成功，开始等到查询回调结果");
        try {
            Thread.sleep(2000);
            Thread.sleep(5000);
        } catch (InterruptedException e) {
            throw new RuntimeException(e);
        }
@@ -1611,6 +1612,7 @@
        //调用推送服务接口，给乘客推送剩余轨迹和里程时长
        if (null != orderId) {
            PushOrderRouteDTO dto1 = new PushOrderRouteDTO();
            dto1.setMessageType(PushMessageTypeEnum.ORDER_ROUTE.getDesc());
            dto1.setOrderId(orderId);
            dto1.setRouteType(1);
            dto1.setLongitude(longitude);