xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
@@ -613,7 +613,7 @@ //驶往下车点的行程 if (orderPhase.equals(OrderPhase.ROUTE_TO_DESTINATION)) { //直接取缓存中的导航数据推送给车端和乘客 Object cacheObject = redisService.getCacheObject("ORDER_NAVIGATION_DATA:" + xpOrder.getAppUserId()); Object cacheObject = redisService.getCacheObject("ORDER_NAVIGATION_END_DATA:" + xpOrder.getAppUserId()); if(null == cacheObject){ //没有缓存数据，重新规划线路 //查询起点到终点的线路 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
@@ -122,7 +122,7 @@ // 存储redis redisService.setCacheObject(CacheConstants.ORDER_ROUTE + "_" + dto.getOrderId() + "_" +dto.getRouteType(), routeVo); // 存储路线偏离缓存，后续进行轨迹截取 redisService.setCacheObject(CacheConstants.ORDER_ROUTE_CAPTURE + "_" + dto.getOrderId() + "_" +dto.getRouteType(), routeVo); // redisService.setCacheObject(CacheConstants.ORDER_ROUTE_CAPTURE + "_" + dto.getOrderId() + "_" +dto.getRouteType(), routeVo); return R.ok(routeVo); } xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
@@ -3,6 +3,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.xiaopeng.api.dto.QueryOrderRouteDTO; import com.xiaopeng.api.dto.order.GetOrderNumDto; @@ -476,9 +477,22 @@ public R<RouteVo> queryOrderRoute(@Validated @RequestBody QueryOrderRouteDTO dto, HttpServletRequest request) { String uid = request.getHeader("XP-Uid"); // 查询订单信息 // XpOrder xpOrder = xpOrderService.getById(dto.getOrderId()); XpOrder xpOrder = xpOrderService.getById(dto.getOrderId()); // 获取路线规划 RouteVo routeVo = redisService.getCacheObject(CacheConstants.ORDER_ROUTE_CAPTURE + "_" + dto.getOrderId() + "_" +dto.getRouteType()); // RouteVo routeVo = redisService.getCacheObject(CacheConstants.ORDER_ROUTE_CAPTURE + "_" + dto.getOrderId() + "_" +dto.getRouteType()); String key = ""; //接驾情况，获取车辆位置到起点的导航 if(xpOrder.getStatus() < 5){ key = "ORDER_NAVIGATION_START_DATA:" + xpOrder.getAppUserId(); } //服务中，获取起点到终点的导航数据 if(xpOrder.getStatus() >= 5){ key = "ORDER_NAVIGATION_END_DATA:" + xpOrder.getAppUserId(); } Object cacheObject = redisService.getCacheObject(key); RouteVo routeVo = JSON.parseObject(cacheObject.toString(), RouteVo.class); return R.ok(routeVo); }
@@ -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<>();
