From d7858472963f6d81335d3d96df66df19455fcb3f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 03 三月 2026 09:45:07 +0800
Subject: [PATCH] 完善订单下单数据
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java | 71 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 13 deletions(-)
diff --git a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
index 5a6b3f0..545dae1 100644
--- a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
+++ b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
@@ -76,6 +76,45 @@
}else {
taskBuilder.setTaskType(OrderType.ORDER_TYPE_ROBOTAXI);
}
+ //构建点位信息
+ Waypoint.Builder pointBuilder = Waypoint.newBuilder();
+ //巡游订单
+ if(dto.getOrderType().equals(com.xiaopeng.api.vo.OrderType.CRUISE_ORDER)){
+ pointBuilder.setPointType(PointType.CRUISE_END_POINT);
+ pointBuilder.setSequence(1);
+ //构建终点坐标
+ GeoPoint.Builder geoPointBuilder = GeoPoint.newBuilder();
+ geoPointBuilder.setLatitude(dto.getEndLatitude());
+ geoPointBuilder.setLongitude(dto.getEndLatitude());
+ // geoPointBuilder.setPoiName("Start Point"); // GeoPoint might not have poi_name
+ pointBuilder.setPoint(geoPointBuilder.build());
+ }else{
+ //用户订单
+ if(dto.getStage() == 1){
+ //开往上车点
+ pointBuilder.setPointType(PointType.START_POINT);
+ pointBuilder.setActionType(ActionType.PICK_UP);
+ pointBuilder.setSequence(1);
+ //构建起点坐标
+ GeoPoint.Builder geoPointBuilder = GeoPoint.newBuilder();
+ geoPointBuilder.setLatitude(dto.getStartLatitude());
+ geoPointBuilder.setLongitude(dto.getStartLongitude());
+ // geoPointBuilder.setPoiName("Start Point"); // GeoPoint might not have poi_name
+ pointBuilder.setPoint(geoPointBuilder.build());
+ }else{
+ //开往终点
+ pointBuilder.setPointType(PointType.END_POINT);
+ pointBuilder.setActionType(ActionType.PICK_UP);
+ pointBuilder.setSequence(1);
+ //构建起点坐标
+ GeoPoint.Builder geoPointBuilder = GeoPoint.newBuilder();
+ geoPointBuilder.setLatitude(dto.getEndLatitude());
+ geoPointBuilder.setLongitude(dto.getEndLatitude());
+ // geoPointBuilder.setPoiName("Start Point"); // GeoPoint might not have poi_name
+ pointBuilder.setPoint(geoPointBuilder.build());
+ }
+ }
+ taskBuilder.addPoints(pointBuilder);
RtTaskList.Builder taskListBuilder = RtTaskList.newBuilder();
taskListBuilder.addTasks(taskBuilder.build());
@@ -169,6 +208,7 @@
if(StringUtils.isNotEmpty(code)){
xpOrder = xpOrderClient.queryOrderByOrderNo(code).getData();
}
+ orderId = xpOrder.getId();
OrderRouteAndFareDto dto = new OrderRouteAndFareDto();
dto.setOrderId(orderId);
LonLatDto origin = new LonLatDto();
@@ -233,16 +273,18 @@
if(StringUtils.isNotEmpty(code)){
xpOrder = xpOrderClient.queryOrderByOrderNo(code).getData();
}
+ orderId = xpOrder.getId();
String vin = xpVehicle.getVehicleVin();
Long appUserId = xpOrder.getAppUserId();
Object cacheObject = redisService.getCacheObject("ORDER_NAVIGATION_START_DATA:" + xpOrder.getAppUserId());
RouteVo routeVo = JSON.parseObject(cacheObject.toString(), RouteVo.class);
ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(1000));
+ Long finalOrderId = orderId;
threadPoolExecutor.execute(() -> {
//等待10秒后开始执行车子位移
try {
- Thread.sleep(10000);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
@@ -268,12 +310,12 @@
vehiclePosition.setSpeed(50F);
vehiclePosition.setCurrentElectricity(80);
vehiclePosition.setMileageRange(300f);
- vehiclePosition.setOrderId(orderId);
+ vehiclePosition.setOrderId(finalOrderId);
mongoTemplate.save(vehiclePosition);
//调用推送服务接口
- if (null != orderId) {
+ if (null != finalOrderId) {
PushOrderRouteDTO dto = new PushOrderRouteDTO();
- dto.setOrderId(orderId);
+ dto.setOrderId(finalOrderId);
dto.setRouteType(1);
dto.setLongitude(longitude);
dto.setLatitude(latitude);
@@ -294,7 +336,7 @@
//构建推送消息
Map<String, Object> params = new HashMap<>();
Map<String, Object> content = new HashMap<>();
- content.put("orderId", orderId.toString());
+ content.put("orderId", finalOrderId.toString());
content.put("status", 4);
params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
params.put("content", JSONObject.toJSONString(content));
@@ -307,7 +349,7 @@
if (R.isError(stringR)) {
log.error("推送消息失败：{}", stringR.getMsg());
}
- xpOrderClient.updateOrderStatus(orderId, OrderStatusEnum.PICK_UP_GUESTS.getCode());
+ xpOrderClient.updateOrderStatus(finalOrderId, OrderStatusEnum.PICK_UP_GUESTS.getCode());
});
}
@@ -328,6 +370,7 @@
if(StringUtils.isNotEmpty(code)){
xpOrder = xpOrderClient.queryOrderByOrderNo(code).getData();
}
+ orderId = xpOrder.getId();
//构建推送消息
Map<String, Object> params = new HashMap<>();
Map<String, Object> content = new HashMap<>();
@@ -397,16 +440,18 @@
if(StringUtils.isNotEmpty(code)){
xpOrder = xpOrderClient.queryOrderByOrderNo(code).getData();
}
+ orderId = xpOrder.getId();
String vin = xpVehicle.getVehicleVin();
Long appUserId = xpOrder.getAppUserId();
Object cacheObject = redisService.getCacheObject("ORDER_NAVIGATION_END_DATA:" + xpOrder.getAppUserId());
RouteVo routeVo = JSON.parseObject(cacheObject.toString(), RouteVo.class);
ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(1000));
+ Long finalOrderId = orderId;
threadPoolExecutor.execute(() -> {
//等待10秒后开始执行车子位移
try {
- Thread.sleep(10000);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
@@ -432,12 +477,12 @@
vehiclePosition.setSpeed(50F);
vehiclePosition.setCurrentElectricity(80);
vehiclePosition.setMileageRange(300f);
- vehiclePosition.setOrderId(orderId);
+ vehiclePosition.setOrderId(finalOrderId);
mongoTemplate.save(vehiclePosition);
//调用推送服务接口
- if (null != orderId) {
+ if (null != finalOrderId) {
PushOrderRouteDTO dto = new PushOrderRouteDTO();
- dto.setOrderId(orderId);
+ dto.setOrderId(finalOrderId);
dto.setRouteType(1);
dto.setLongitude(longitude);
dto.setLatitude(latitude);
@@ -448,7 +493,7 @@
//存储历史轨迹
OrderTrajectoryVo orderTrajectory = new OrderTrajectoryVo();
- orderTrajectory.setOrderId(orderId);
+ orderTrajectory.setOrderId(finalOrderId);
orderTrajectory.setLocation(longitude + "," + latitude);
orderTrajectory.setDirection(dto.getDirection());
orderTrajectory.setSpeed(0D);
@@ -468,7 +513,7 @@
//构建推送消息
Map<String, Object> params = new HashMap<>();
Map<String, Object> content = new HashMap<>();
- content.put("orderId", orderId.toString());
+ content.put("orderId", finalOrderId.toString());
content.put("status", 7);
params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
params.put("content", JSONObject.toJSONString(content));
@@ -481,7 +526,7 @@
if (R.isError(stringR)) {
log.error("推送消息失败：{}", stringR.getMsg());
}
- xpOrderClient.updateOrderStatus(orderId, OrderStatusEnum.SEE_OFF_GUESTS.getCode());
+ xpOrderClient.updateOrderStatus(finalOrderId, OrderStatusEnum.SEE_OFF_GUESTS.getCode());
});
}
--
Gitblit v1.7.1