From 4f01fa9a654ea4935d6bf8ce97c2485a9113497d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 01 三月 2026 03:37:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 bbd99c2..b9da1cf 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
@@ -51,7 +51,7 @@
 import com.xiaopeng.common.core.utils.uuid.UUID;
 import com.xiaopeng.common.redis.service.RedisService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.geo.Point;import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -277,7 +277,7 @@
         long sequence = msgContent.getHeader().getSequence();
         responseMessage(sequence, vin);
         //保存车辆实时位置到redis
-        redisTemplate.opsForGeo().add("vehiclePosition:" + vin, new GeoJsonPoint(longitude, latitude), vin);
+        redisTemplate.opsForGeo().add("vehiclePosition:" + vin, new Point(longitude, latitude), vin);
 
         //保存车辆实时信息到mongodb
         VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(vin)), VehiclePosition.class);
@@ -927,7 +927,7 @@
             //构建推送消息
             Map<String, Object> params = new HashMap<>();
             Map<String, Object> content = new HashMap<>();
-            content.put("orderId", orderId);
+            content.put("orderId", orderId.toString());
             content.put("status", status.getCode());
             params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
             params.put("content", JSONObject.toJSONString(content));

--
Gitblit v1.7.1