From 8fb7dde57b835463a6786a2e038f0ecd3dba827b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 11 三月 2026 16:21:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
index 53b5547..a8275be 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
@@ -82,7 +82,7 @@
// 下发命令
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(xpVehicle.getVehicleVin());
- pushOrderDto.setOrderId(newCruiseOrder.getData().getId());
+ pushOrderDto.setOrderId("XU" + newCruiseOrder.getData().getId());
pushOrderDto.setStartLatitude(newCruiseOrder.getData().getStartLat());
pushOrderDto.setStartLongitude(newCruiseOrder.getData().getStartLon());
pushOrderDto.setEndLatitude(newCruiseOrder.getData().getEndLat());
@@ -95,7 +95,7 @@
}else if(dto.getDepartureStatus()==3){
// 收车 关闭当前巡游单子 生成新的返程单子 找到收车站点
- R<String> r = xpCruiseOrderClient.updateCruiseOrder(xpVehicle.getVehicleVin());
+ R<Long> r = xpCruiseOrderClient.updateCruiseOrder(xpVehicle.getVehicleVin());
// redis 获取当前最新经纬度位置
VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(xpVehicle.getVehicleVin())), VehiclePosition.class);
@@ -107,7 +107,6 @@
xpCruiseOrder.setStartLat(y);
}
- xpCruiseOrder.setId("XU"+ IdUtil.fastUUID());
xpCruiseOrder.setVehicleId(xpVehicle.getId());
xpCruiseOrder.setFleetId(xpVehicle.getFleetId());
xpCruiseOrder.setOrderType(2);
@@ -122,7 +121,7 @@
// 下发命令
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(returnCruisePoint.getVehicleVin());
- pushOrderDto.setOrderId(returnCruisePoint.getId());
+ pushOrderDto.setOrderId("XU" + returnCruisePoint.getId());
pushOrderDto.setStartLatitude(returnCruisePoint.getStartLat());
pushOrderDto.setStartLongitude(returnCruisePoint.getStartLon());
pushOrderDto.setEndLatitude(returnCruisePoint.getEndLat());
--
Gitblit v1.7.1