From bbdd5f4f286fc593c5c30bd1bccd1f39af135dfa Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 三月 2026 09:43:45 +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/controller/OrderMissionController.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
index 1a25399..2668fce 100644
--- a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
+++ b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
@@ -62,7 +62,6 @@
     @Resource
     private XpVehicleClient xpVehicleClient;
 
-
     @PostMapping("/inner/pushOrder")
     public R<Boolean> pushOrder(@RequestBody PushOrderDto dto) {
         RtTask.Builder taskBuilder = RtTask.newBuilder();
@@ -200,7 +199,7 @@
     @GetMapping("/base/v1/order/acceptingOrder")
     public R acceptingOrder(Long orderId, String code, Long vehicleId, Double startLon, Double startLat){
         if(null == vehicleId){
-            vehicleId = 1L;
+            vehicleId = 11L;//默认使用造的测试车辆
         }
         if(null == startLat || null == startLon){
             startLat = 30.583407D;
@@ -258,6 +257,17 @@
             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);
+//        dto3.setDirection(60);
+//        xpPushMessageClient.pushOrderRoute(dto3);
+
         return r;
     }
 

--
Gitblit v1.7.1