From 352ed0e639c084e257914bcd8b78169f09e51985 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 28 二月 2026 21:29:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
index d3c6fd2..bbd99c2 100644
--- a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
+++ b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
@@ -1,6 +1,5 @@
 package com.xiaopeng.automaticPilot.service;
 
-import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
@@ -101,9 +100,6 @@
 
     @Resource
     private XpCruiseOrderClient xpCruiseOrderClient;
-
-    @Resource
-    private Snowflake snowflake;
 
     @Resource
     private RedisService redisService;
@@ -699,7 +695,9 @@
 
         }
         orderOperationBuilder.addAllWaypoints(waypoints);
-        long sequence = snowflake.nextId();
+        SnowFlake snowFlake = new SnowFlake(0, 0);
+        snowFlake.withStartTimestamp(1420041600000L);
+        long sequence = snowFlake.nextId();
         // 处理数据
         redisTemplate.opsForValue().set(sequence,"pushOrder_"+orderId+"_"+vin,30, TimeUnit.MINUTES);
         //开发发送请求到XPU
@@ -962,7 +960,9 @@
         navigationDataBuilder.setRequestId(requestId);
         navigationDataBuilder.setContent(routeDataContent);
         navigationDataBuilder.setTimestamp(System.currentTimeMillis());
-        long sequence = snowflake.nextId();
+        SnowFlake snowFlake = new SnowFlake(0, 0);
+        snowFlake.withStartTimestamp(1420041600000L);
+        long sequence = snowFlake.nextId();
         // 处理数据
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("event", SystemEventType.PUSH_NAVIGATION);

--
Gitblit v1.7.1