Merge remote-tracking branch 'origin/master'

xuhy

2026-03-01 22f3c92376854d678cf3dafcab2758ff0a62ae5c

Merge remote-tracking branch 'origin/master'

 xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java

@@ -181,7 +181,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", 3);
        params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
        params.put("content", JSONObject.toJSONString(content));
@@ -196,6 +196,14 @@
            log.error("推送消息失败：{}", stringR.getMsg());
        }
        xpOrderClient.updateOrderStatus(orderId, OrderStatusEnum.PICK_UP.getCode());
        PushOrderRouteDTO dto3 = new PushOrderRouteDTO();
        dto3.setOrderId(orderId);
        dto3.setRouteType(1);
        dto3.setLongitude(startLon);
        dto3.setLatitude(startLat);
        dto3.setDuration(10);
        dto3.setDistance(2);
        xpPushMessageClient.pushOrderRoute(dto3);
        return r;
    }

@@ -268,7 +276,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", 4);
            params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
            params.put("content", JSONObject.toJSONString(content));
@@ -299,7 +307,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);
        params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
        params.put("content", JSONObject.toJSONString(content));
@@ -386,7 +394,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", 4);
            params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
            params.put("content", JSONObject.toJSONString(content));

 xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java

@@ -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));

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java

@@ -249,8 +249,8 @@
        String endTime = "";
        if(StringUtils.isNotEmpty(query.getStatisticDate())){
            String statisticDate = query.getStatisticDate();
            startTime = statisticDate.split(" - ")[0];
            endTime = statisticDate.split(" - ")[1];
            startTime = statisticDate.split(" - ")[0].split(" ")[0];
            endTime = statisticDate.split(" - ")[1].split(" ")[0];
        }
        //查询数据
        List<ClockInStatisticsDto> clockInStatistics = this.baseMapper.getClockInStatistics(pageInfo, appUserIds, startTime, endTime);
@@ -309,8 +309,8 @@
        String endTime = "";
        if(StringUtils.isNotEmpty(query.getStatisticDate())){
            String statisticDate = query.getStatisticDate();
            startTime = statisticDate.split(" - ")[0];
            endTime = statisticDate.split(" - ")[1];
            startTime = statisticDate.split(" - ")[0].split(" ")[0];
            endTime = statisticDate.split(" - ")[1].split(" ")[0];
        }
        //查询数据
        List<ClockInStatisticsDto> clockInStatistics = this.baseMapper.getClockInStatistics(pageInfo, appUserIds, startTime, endTime);
@@ -355,8 +355,8 @@
        String endTime = "";
        if(StringUtils.isNotEmpty(query.getStatisticDate())){
            String statisticDate = query.getStatisticDate();
            startTime = statisticDate.split(" - ")[0];
            endTime = statisticDate.split(" - ")[1];
            startTime = statisticDate.split(" - ")[0].split(" ")[0];
            endTime = statisticDate.split(" - ")[1].split(" ")[0];
        }
        List<ClockInStatisticsDetailsDto> clockInStatisticsDetails = this.baseMapper.getClockInStatisticsDetails(pageInfo, query.getAppUserId(), startTime, endTime);
        List<XpOperationsUserWithRoleVO> data = xpOperationUserClient.listByIdsWithRole(Arrays.asList(query.getAppUserId())).getData();
@@ -384,8 +384,8 @@
        String endTime = "";
        if(StringUtils.isNotEmpty(query.getStatisticDate())){
            String statisticDate = query.getStatisticDate();
            startTime = statisticDate.split(" - ")[0];
            endTime = statisticDate.split(" - ")[1];
            startTime = statisticDate.split(" - ")[0].split(" ")[0];
            endTime = statisticDate.split(" - ")[1].split(" ")[0];
        }
        List<ClockInStatisticsDetailsDto> clockInStatisticsDetails = this.baseMapper.getClockInStatisticsDetails(pageInfo, query.getAppUserId(), startTime, endTime);
        List<XpOperationsUserWithRoleVO> data = xpOperationUserClient.listByIdsWithRole(Arrays.asList(query.getAppUserId())).getData();

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java

@@ -1051,7 +1051,7 @@
        // 消息推送
        Map<String, Object> params = new HashMap<>();
        Map<String, Object> content = new HashMap<>();
        content.put("orderId", order.getId());
        content.put("orderId", order.getId().toString());
        content.put("status", OrderStatusEnum.CANCELED.getCode());
        params.put("type", PushMessageTypeEnum.ORDER_STATUS.getDesc());
        params.put("content", com.alibaba.fastjson2.JSONObject.toJSONString(content));