From e5ce80ab58aa44c25726c29b84e3e07fc41d2f4a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 二月 2026 22:17:44 +0800
Subject: [PATCH] 合并代码

---
 xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java b/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
index 321f25e..eb3c28b 100644
--- a/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
+++ b/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
@@ -6,6 +6,7 @@
 import com.alibaba.fastjson2.JSON;
 import com.xiaopeng.api.dto.map.OrderRouteAndFareDto;
 import com.xiaopeng.api.dto.operation.LonLatDto;
+import com.xiaopeng.api.dto.pushMessage.PushOrderRouteDTO;
 import com.xiaopeng.api.dto.pushMessage.SendMessageDTO;
 import com.xiaopeng.api.feignClient.map.XpMapClient;
 import com.xiaopeng.api.feignClient.order.XpOrderClient;
@@ -270,10 +271,17 @@
         vehiclePosition.setOrderId(orderId);
         mongoTemplate.save(vehiclePosition);
         //调用推送服务接口
-        SendMessageDTO dto = new SendMessageDTO();
-        dto.setAppUserId(orderId);
-        dto.setMessage(JSON.toJSONString(vehiclePosition));
-        xpPushMessageClient.sendVehicleLocation(dto);
+        if(null != orderId){
+            RtTripInfo rtTripInfo = systemRuntimeStatus.getRt_trip_info();
+            PushOrderRouteDTO dto = new PushOrderRouteDTO();
+            dto.setOrderId(orderId);
+            dto.setRouteType(order_id.contains("XU") ? 2 : 1);
+            dto.setLongitude(longitude);
+            dto.setLatitude(latitude);
+            dto.setDuration(rtTripInfo.getRemaining_time());
+            dto.setDistance(rtTripInfo.getRemaining_distance().intValue());
+            xpPushMessageClient.pushOrderRoute(dto);
+        }
     }
 
 

--
Gitblit v1.7.1