Merge remote-tracking branch 'origin/master'

无关风月

2026-02-28 31df04b76eea1aac2b2ea726769f2a82da15564a

 xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java

@@ -346,7 +346,7 @@
            log.info("车辆故障，开始处理故障");
            // TODO 添加异常任务
            // 解绑用户与车辆关系
            CancelTaxiPassengerVo cancelTaxiPassengerVo = new CancelTaxiPassengerVo();
//            CancelTaxiPassengerVo cancelTaxiPassengerVo = new CancelTaxiPassengerVo();
            String orderId = systemRuntimeStatus.getRunningOrderStatusInfo().getOrderId();
            XpOrder xpOrder = xpOrderClient.queryOrderById(Long.parseLong(orderId)).getData();
            XpVehicle vehicle = xpVehicleClient.queryById(xpOrder.getVehicleId()).getData();
@@ -354,12 +354,12 @@
                // 修改车辆状态
                vehicle.setOperatingStatus(4);
                xpVehicleClient.updateVehicleById(vehicle);
                cancelTaxiPassengerVo.setVin(vehicle.getVehicleVin());
                cancelTaxiPassengerVo.setUid(xpOrder.getAppUserId().toString());
                cancelTaxiPassengerVo.setOrderNo(xpOrder.getOrderNumber());
                // TODO
//            cancelTaxiPassengerVo.setAppId();
                userVehicleClient.cancelTaxiPassenger(cancelTaxiPassengerVo);
//                cancelTaxiPassengerVo.setVin(vehicle.getVehicleVin());
//                cancelTaxiPassengerVo.setUid(xpOrder.getAppUserId().toString());
//                cancelTaxiPassengerVo.setOrderNo(xpOrder.getOrderNumber());
//                // TODO
////            cancelTaxiPassengerVo.setAppId();
//                userVehicleClient.cancelTaxiPassenger(cancelTaxiPassengerVo);
            }
            // 取消订单
//            R<?> r = xpOrderClient.cancelOrder(String.valueOf(xpOrder.getId()));
@@ -376,7 +376,14 @@
            Double longitude = naviPose.getLongitude();
            reassignOrderDTO.setLongitude(longitude);
            reassignOrderDTO.setLatitude(latitude);
            reassignOrderDTO.setVehicleId(xpOrder.getVehicleId());
            reassignOrderDTO.setOrderId(xpOrder.getId());
            reassignOrderDTO.setFleetId(xpOrder.getFleetId());
            reassignOrderClient.reassignOrder(reassignOrderDTO);




//            }
        }
    }