From fcf2cef3514e2602943bc40a9066ef139d8df6d4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期六, 28 二月 2026 18:56:36 +0800
Subject: [PATCH] 处理异常情况改派逻辑 解绑逻辑

---
 xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 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 0c47a3f..1c12400 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
@@ -343,7 +343,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();
@@ -351,12 +351,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()));
@@ -373,7 +373,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);
+
+
+
+
 //            }
         }
     }

--
Gitblit v1.7.1