From fd30c37a9f7a564b8f5706367866ede775c07d5b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 01 三月 2026 04:55:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/PushOrderRouteController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/PushOrderRouteController.java b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/PushOrderRouteController.java
index 19f108b..eb59555 100644
--- a/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/PushOrderRouteController.java
+++ b/xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/PushOrderRouteController.java
@@ -1,5 +1,6 @@
package com.xiaopeng.pushMessage.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.xiaopeng.api.dto.operation.LonLatDto;
import com.xiaopeng.api.dto.pushMessage.PushOrderRouteDTO;
@@ -23,6 +24,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
+import java.util.concurrent.TimeUnit;
@Api(tags = "订单推送轨迹接口")
@RestController
@@ -52,7 +54,15 @@
routeType = xpOrder.getStatus() == 3 ? 1 : 2;
}
// 获取路线规划
- RouteVo routeVo = redisService.getCacheObject(CacheConstants.ORDER_ROUTE_CAPTURE + "_" + dto.getOrderId() + "_" +routeType);
+ String key = "";
+ //接驾情况，获取车辆位置到起点的导航
+ if(1 == routeType){
+ key = "ORDER_NAVIGATION_START_DATA:" + xpOrder.getAppUserId();
+ }else{
+ key = "ORDER_NAVIGATION_END_DATA:" + xpOrder.getAppUserId();
+ }
+ Object cacheObject = redisService.getCacheObject(key);
+ RouteVo routeVo = JSON.parseObject(cacheObject.toString(), RouteVo.class);
if(Objects.nonNull(routeVo)){
@@ -64,7 +74,9 @@
routeVo.setPolyline(lonLatDtos);
// 存储最新路线偏离缓存，后续进行轨迹截取
- redisService.setCacheObject(CacheConstants.ORDER_ROUTE_CAPTURE + "_" + dto.getOrderId() + "_" +routeType, routeVo);
+// redisService.setCacheObject(CacheConstants.ORDER_ROUTE_CAPTURE + "_" + dto.getOrderId() + "_" +routeType, routeVo);
+
+ redisService.setCacheObject(key, routeVo, 24L, TimeUnit.HOURS);
// 封装轨迹点位集合
List<Map<String, Object>> polyline = new ArrayList<>();
--
Gitblit v1.7.1