From 43f10a422efd983a5f806db2f20520ebe1414cae Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 五月 2026 13:47:38 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
index 6489ddd..4cad90b 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -407,6 +407,8 @@
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(priorityVin);
pushOrderDto.setOrderId(orderCheck.getData().getId().toString());
+ pushOrderDto.setStartWaypointId(orderCheck.getData().getStartPointId());
+ pushOrderDto.setEndWaypointId(orderCheck.getData().getEndPointId());
pushOrderDto.setStartLatitude(orderCheck.getData().getStartLat());
pushOrderDto.setStartLongitude(orderCheck.getData().getStartLon());
pushOrderDto.setEndLatitude(orderCheck.getData().getEndLat());
@@ -1092,6 +1094,8 @@
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(vehiclePosition.getVehicleVin());
pushOrderDto.setOrderId(xpOrder.getId().toString());
+ pushOrderDto.setStartWaypointId(xpOrder.getStartPointId());
+ pushOrderDto.setEndWaypointId(xpOrder.getEndPointId());
pushOrderDto.setStartLatitude(xpOrder.getStartLat());
pushOrderDto.setStartLongitude(xpOrder.getStartLon());
pushOrderDto.setEndLatitude(xpOrder.getEndLat());
@@ -1157,6 +1161,8 @@
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(vehiclePosition.getVin());
pushOrderDto.setOrderId(xpOrder.getId().toString());
+ pushOrderDto.setStartWaypointId(xpOrder.getStartPointId());
+ pushOrderDto.setEndWaypointId(xpOrder.getEndPointId());
pushOrderDto.setStartLatitude(xpOrder.getStartLat());
pushOrderDto.setStartLongitude(xpOrder.getStartLon());
pushOrderDto.setEndLatitude(xpOrder.getEndLat());
@@ -1347,6 +1353,8 @@
pushOrderDto.setStartTaskId(orderCheck.getData().getXpuStartTaskId());
pushOrderDto.setEndTaskId(orderCheck.getData().getXpuEndTaskId());
pushOrderDto.setOrderId(orderCheck.getData().getId().toString());
+ pushOrderDto.setStartWaypointId(orderCheck.getData().getStartPointId());
+ pushOrderDto.setEndWaypointId(orderCheck.getData().getEndPointId());
pushOrderDto.setStartLatitude(orderCheck.getData().getStartLat());
pushOrderDto.setStartLongitude(orderCheck.getData().getStartLon());
pushOrderDto.setEndLatitude(orderCheck.getData().getEndLat());
@@ -2025,6 +2033,8 @@
pushOrderDto.setEndTaskId(xpOrder.getXpuEndTaskId());
pushOrderDto.setVin(vehiclePosition.getVehicleVin());
pushOrderDto.setOrderId(xpOrder.getId().toString());
+ pushOrderDto.setStartWaypointId(xpOrder.getStartPointId());
+ pushOrderDto.setEndWaypointId(xpOrder.getEndPointId());
pushOrderDto.setStartLatitude(xpOrder.getStartLat());
pushOrderDto.setStartLongitude(xpOrder.getStartLon());
pushOrderDto.setEndLatitude(xpOrder.getEndLat());
@@ -2093,6 +2103,8 @@
pushOrderDto.setEndTaskId(xpOrder.getXpuEndTaskId());
pushOrderDto.setVin(vehiclePosition.getVin());
pushOrderDto.setOrderId(xpOrder.getId().toString());
+ pushOrderDto.setStartWaypointId(xpOrder.getStartPointId());
+ pushOrderDto.setEndWaypointId(xpOrder.getEndPointId());
pushOrderDto.setStartLatitude(xpOrder.getStartLat());
pushOrderDto.setStartLongitude(xpOrder.getStartLon());
pushOrderDto.setEndLatitude(xpOrder.getEndLat());
@@ -2216,6 +2228,8 @@
private static PushOrderDto buildPushOrderDto(XpOrder xpOrder) {
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setOrderId(xpOrder.getId().toString());
+ pushOrderDto.setStartWaypointId(xpOrder.getStartPointId());
+ pushOrderDto.setEndWaypointId(xpOrder.getEndPointId());
pushOrderDto.setStartLatitude(xpOrder.getStartLat());
pushOrderDto.setStartLongitude(xpOrder.getStartLon());
pushOrderDto.setEndLatitude(xpOrder.getEndLat());
@@ -2399,6 +2413,8 @@
pushOrderDto.setEndTaskId(data.getXpuEndTaskId());
pushOrderDto.setVin(vehiclePosition.getVin());
pushOrderDto.setOrderId(data.getId().toString());
+ pushOrderDto.setStartWaypointId(data.getStartPointId());
+ pushOrderDto.setEndWaypointId(data.getEndPointId());
pushOrderDto.setStartLatitude(data.getStartLat());
pushOrderDto.setStartLongitude(data.getStartLon());
pushOrderDto.setEndLatitude(data.getEndLat());
--
Gitblit v1.7.1