From 76660dd82cc2a5c090391680a38022c82140fad6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 25 二月 2026 18:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 e14d760..ac51192 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
@@ -536,11 +536,14 @@
if (orderPhase.equals(OrderPhase.ROUTE_TO_CRUISE)) {
//先响应消息
responseMessage(sequence, "");
- //构建导航数据给到车端
- origin.setLongitude(116.40528);
- origin.setLatitude(39.90498);
- destination.setLongitude(116.40528);
- destination.setLatitude(39.90498);
+ /* 构建导航数据给到车端 */
+ R<XpCruiseOrder> cruiseOrder = xpCruiseOrderClient.getCruiseOrder(orderId);
+ XpCruiseOrder xpCruiseOrder = cruiseOrder.getData();
+
+ origin.setLongitude(xpCruiseOrder.getStartLon());
+ origin.setLatitude(xpCruiseOrder.getStartLat());
+ destination.setLongitude(xpCruiseOrder.getEndLon());
+ destination.setLatitude(xpCruiseOrder.getEndLat());
OrderRouteAndFareDto dto = new OrderRouteAndFareDto();
dto.setOrderId(Long.parseLong(orderId));
@@ -804,15 +807,15 @@
//到达目的地
if(OrderStatusEnum.COMPLETED.equals(status)){
- // 返程找到目前的订单 -》之前的订单 查询生成一个 正常巡游 找到下一个点位 若到达最后点位 则反向找点位 每次判断是否收车状态 是则不进行处理了
+ // 返程找到目前的订单 -》之前的订单 查询生成一个 正常巡游 找到下一个点位 若到达最后点位 则反向找点位 每次判断是否收车状态 是则不进行处理了
// 找到这个订单
R<XpCruiseOrder> cruiseOrder = xpCruiseOrderClient.getCruiseOrder(orderId);
if(cruiseOrder!=null){
XpCruiseOrder xpCruiseOrder = cruiseOrder.getData();
Long vehicleId = xpCruiseOrder.getVehicleId();
- // 关闭当前巡游单子
- xpCruiseOrderClient.updateCruiseOrder(xpCruiseOrder.getVehicleVin());
+ // 关闭当前巡游单子 已完成
+ xpCruiseOrderClient.closeCruiseOrder(xpCruiseOrder.getVehicleVin());
R<XpVehicle> xpVehicleR = xpVehicleClient.queryById(vehicleId);
XpVehicle xpVehicle = xpVehicleR.getData();
// 运营中 继续执行
@@ -824,6 +827,7 @@
// 修改一下id 加一个一样的巡游单子
lastXpCruiseOrder.setId("XU"+ IdUtil.fastUUID());
+ lastXpCruiseOrder.setStatus(1);
xpCruiseOrderClient.addCruiseOrder(lastXpCruiseOrder);
--
Gitblit v1.7.1