From 6f55da80d19cba61bd23cd302b76bbb23038f7bd Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期二, 21 四月 2026 12:03:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
index 5f372eb..0775e52 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Snowflake;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
@@ -138,6 +139,9 @@
@Resource
private BootCommonService bootCommonService;
+ @Resource(name = "hutoolSnowflake")
+ private Snowflake snowflake;
+
@@ -242,6 +246,7 @@
xpOrder.setStatus(1);
xpOrder.setOrderSource(1);
xpOrder.setOpenTrunk(2);
+ xpOrder.setXpuTaskId(snowflake.nextId() + "");
// 当前时段
String currentTimeSlot = DateUtils.getCurrentTimeSlot();
@@ -262,6 +267,7 @@
redisService.setCacheObject("TEST_ORDER_NAVIGATION_END_DATA:" + vehicleId, JSON.toJSONString(routeVo), 24L, TimeUnit.HOURS);
//下发XPU消息
PushOrderDto pushOrderDto = new PushOrderDto();
+ pushOrderDto.setTaskId(xpOrder.getXpuTaskId());
pushOrderDto.setVin(xpVehicle.getVehicleVin());
pushOrderDto.setOrderId("TEST" + xpOrder.getId());
pushOrderDto.setStartLatitude(xpOrder.getStartLat());
@@ -823,6 +829,7 @@
try {
// 11.2 下发订单到新车辆
PushOrderDto pushOrderDto = new PushOrderDto();
+ pushOrderDto.setTaskId(order.getXpuTaskId());
pushOrderDto.setVin(newVehicle.getVehicleVin());
pushOrderDto.setOrderId("TEST" + order.getId());
pushOrderDto.setStartLatitude(order.getStartLat());
--
Gitblit v1.7.1