Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi in...

liujie

2026-05-12 b1aa3a40e6ba7d4591df50c679a2fa9aabf81759

Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0

 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,16 +1888,12 @@
                    xpVehicleClient.updateVehicleById(vehicle1);
                    log.info("用户取消订单，车辆状态修改0 {}", xpVehicle.getPlateNumber());
                }
                //车辆继续巡游
                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());
@@ -1908,6 +1903,10 @@
                    log.error("删除蓝牙解锁失败：{} {}", delete.getMsg(), order.getOrderNumber());
                }
            }

                //车辆继续巡游
                addCruiseMission(order, status);
            }
        }else{
            //流量接入-订单推送 推送取消订单
            officialPartnerUtil.pushCancelOrder(order.getOfficialPartnerId(), xpOrderCancel, order.getStatus());

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