Merge remote-tracking branch 'origin/master'

“mitao”

2026-03-26 52d7a440b10e244c5242738540f1b61fc957363b

 xp-robotaxi-push-message-boot/src/main/java/com/xiaopeng/pushMessage/controller/PushOrderRouteController.java

@@ -6,8 +6,10 @@
import com.xiaopeng.api.dto.pushMessage.PushOrderRouteDTO;
import com.xiaopeng.api.dto.pushMessage.SendMessageDTO;
import com.xiaopeng.api.feignClient.order.XpOrderClient;
import com.xiaopeng.api.feignClient.order.XpTestOrderClient;
import com.xiaopeng.api.feignClient.pushMessage.XpPushMessageClient;
import com.xiaopeng.api.model.order.XpOrder;
import com.xiaopeng.api.model.order.XpTestOrder;
import com.xiaopeng.api.vo.operation.RouteVo;
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.constant.Constants;
@@ -44,24 +46,20 @@
    private XpOrderClient xpOrderClient;

    /**
     * 通过定位推送订单轨迹
     * 通过车辆实时位置
     * 给乘客端推送剩余轨迹和剩余里程时长
     * @return
     */
    @PostMapping("/inner/v1/order/pushOrderRoute")
    public R<String> pushOrderRoute(@Validated @RequestBody PushOrderRouteDTO dto) {
        // 查询订单信息
        XpOrder xpOrder = xpOrderClient.queryOrderById(dto.getOrderId()).getData();
        // 封装消息内容
        Integer routeType = dto.getRouteType();
        if(routeType == 2){
            routeType = 3;
        }else {
            routeType = xpOrder.getStatus() == 2 || xpOrder.getStatus() == 3 ? 1 : 2;
        }
        //正常订单
        if(routeType == 1){
            XpOrder xpOrder = xpOrderClient.queryOrderById(dto.getOrderId()).getData();
        // 获取路线规划
        String key = "";
        //接驾情况，获取车辆位置到起点的导航
        if(1 == routeType){
            if(xpOrder.getStatus() == 2 || xpOrder.getStatus() == 3){
            key = "ORDER_NAVIGATION_START_DATA:" + xpOrder.getAppUserId();
        }else{
            key = "ORDER_NAVIGATION_END_DATA:" + xpOrder.getAppUserId();
@@ -70,12 +68,20 @@
        RouteVo routeVo = JSON.parseObject(cacheObject.toString(), RouteVo.class);

        if(Objects.nonNull(routeVo)){

                Integer distance = dto.getDistance();
                Integer duration = dto.getDuration();
            // 计算实时点位到线段的最优截取
            List<LonLatDto> lonLatDtos = MapMatchingUtil.getRemainingNavigation(routeVo.getPolyline(), dto.getLongitude(), dto.getLatitude());

            routeVo.setDistance(dto.getDistance());
            routeVo.setDuration(dto.getDuration());
                //当订单状态为5的时候（乘客已上车）需要推送导航的距离和剩余时间
                //因为这个状态，车端推的依然是接驾的剩余里程和时间，就会导致数据和小程序的页面跳转匹配不上
                //小程序是只要乘客上车后就跳转到行程开始页面
                if(5 != xpOrder.getStatus()){
                    routeVo.setDistance(distance);
                    routeVo.setDuration(duration);
                }else{
                    distance = routeVo.getDistance();
                    duration = routeVo.getDuration();
                }
            routeVo.setPolyline(lonLatDtos);

            // 存储最新路线偏离缓存，后续进行轨迹截取
@@ -91,8 +97,8 @@
            }
            // 封装路由详情
            Map<String, Object> route = new HashMap<>();
            route.put("distance",dto.getDistance());
            route.put("duration",dto.getDuration());
                route.put("distance",distance);
                route.put("duration",duration);
            route.put("polyline",JSONObject.toJSONString(polyline));

            Map<String, Object> content = new HashMap<>();
@@ -133,6 +139,7 @@

            log.info("推送剩余导航数据成功 {} {}", xpOrder.getOrderNumber(), JSON.toJSONString(routeVo));
        }
        }
        return R.ok();
    }