From fa653a30fd3fa755724ba8ce7e18b6a675eb4821 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 12 三月 2026 14:00:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
index 67e8844..fc9cc8c 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleOperationsController.java
@@ -83,19 +83,10 @@
             // 找车辆的任务  生成巡游单子 下发命令
             R<XpCruiseOrder> newCruiseOrder = xpCruisePlanClient.getNewCruiseOrder(new NewCruiseOrderDto(xpVehicle.getId(),xpVehicle.getVehicleVin(),xpVehicle.getFleetId(),vehiclePosition.getPoint()));
             if(newCruiseOrder.getData()!=null){
-
-                xpCruiseOrderClient.addCruiseOrder(newCruiseOrder.getData());
-                // 下发命令
-                PushOrderDto pushOrderDto = new PushOrderDto();
-                pushOrderDto.setVin(xpVehicle.getVehicleVin());
-                pushOrderDto.setOrderId("XU" + newCruiseOrder.getData().getId());
-                pushOrderDto.setStartLatitude(newCruiseOrder.getData().getStartLat());
-                pushOrderDto.setStartLongitude(newCruiseOrder.getData().getStartLon());
-                pushOrderDto.setEndLatitude(newCruiseOrder.getData().getEndLat());
-                pushOrderDto.setEndLongitude(newCruiseOrder.getData().getEndLon());
-                pushOrderDto.setOrderType(OrderType.CRUISE_ORDER);
-                pushOrderDto.setStage(2);
-                orderMissionClient.pushOrder(pushOrderDto);
+                R<Long> longR = xpCruiseOrderClient.addCruiseOrder(newCruiseOrder.getData());
+                if(200 != longR.getCode()){
+                    return R.fail(longR.getMsg());
+                }
             }
 
 

--
Gitblit v1.7.1