From 746517aca9d0b7ae334c70b3041a9b1de795addb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 四月 2026 11:08:37 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 b192bcc..0d93dd2 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
@@ -2,6 +2,7 @@
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.xiaopeng.api.dto.automaticPilot.PushOrderDto;
import com.xiaopeng.api.dto.map.RouteAndFareDto;
import com.xiaopeng.api.dto.operation.LonLatDto;
@@ -129,6 +130,7 @@
/**
* 5秒执行一次
+ * 播单
*/
@Scheduled(cron = "0/5 * * * * ?")
public void taskOrder() {
@@ -1160,7 +1162,11 @@
pushOrderDto.setTaskId(xpOrder.getXpuTaskId());
// 订单流转
orderMissionClient.pushOrder(pushOrderDto);
- redisService.setCacheObject(CacheConstants.nextOrder(luckyOder.getId().toString()), xpOrder.getId());
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("orderId", xpOrder.getId());
+ jsonObject.put("endLongitude", xpOrder.getEndLat());
+ jsonObject.put("endLatitude", xpOrder.getEndLat());
+ redisService.setCacheObject(CacheConstants.nextOrder(luckyOder.getId().toString()), jsonObject.toJSONString());
redisService.setCacheObject(CacheConstants.navigationStart(xpOrder.getAppUserId().toString()), routeToOrigin);
redisService.removeByPattern(quoteName,xpOrder.getOrderNumber());
log.info("将订单 {} 从队列 {} 弹出去", orderNo, quoteName);
@@ -1306,7 +1312,11 @@
pushOrderDto.setVin(xpVehicle.getVehicleVin());
// 订单流转
orderMissionClient.pushOrder(pushOrderDto);
- redisService.setCacheObject(CacheConstants.nextOrder(luckyOder.getId().toString()), data.getId());
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("orderId", data.getId());
+ jsonObject.put("endLongitude", data.getEndLat());
+ jsonObject.put("endLatitude", data.getEndLat());
+ redisService.setCacheObject(CacheConstants.nextOrder(luckyOder.getId().toString()), jsonObject.toJSONString());
redisService.setCacheObject(CacheConstants.navigationStart(data.getAppUserId().toString()), routeToOrigin);
break;
}
--
Gitblit v1.7.1