From 75e876d8e6f5123a4b346c25c35a8fa56302ef5c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 二月 2026 11:48:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 1fca048..dafd694 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
@@ -427,13 +427,17 @@
if (orderId.contains("XU")) {
orderType = OrderType.CRUISE_ORDER;
// todo 下发巡游单的导航数据
+
+ R<XpCruiseOrder> cruiseOrder = xpCruiseOrderClient.getCruiseOrder(orderId);
+ XpCruiseOrder xpCruiseOrder = cruiseOrder.getData();
+
//先响应消息
responseMessage(sequence, "");
//构建导航数据给到车端
- origin.setLongitude(116.40528);
- origin.setLatitude(39.90498);
- destination.setLongitude(116.40528);
- destination.setLatitude(39.90498);
+ origin.setLongitude(longitude);
+ origin.setLatitude(latitude);
+ destination.setLongitude(xpCruiseOrder.getEndLon());
+ destination.setLatitude(xpCruiseOrder.getEndLat());
OrderRouteAndFareDto dto = new OrderRouteAndFareDto();
dto.setOrderId(Long.parseLong(orderId));
@@ -447,7 +451,7 @@
routeID = routeVo.getRouteID();
-// vehicleId = xpOrder.getVehicleId();
+ vehicleId = xpCruiseOrder.getVehicleId();
} else {
orderType = OrderType.USER_ORDER;
//正常单
@@ -557,7 +561,7 @@
routeID = routeVo.getRouteID();
-// vehicleId = xpOrder.getVehicleId();
+ vehicleId = xpCruiseOrder.getVehicleId();
}
} else {
orderType = OrderType.USER_ORDER;
--
Gitblit v1.7.1