From 1156357c312f54dfb53f59e178beea44fcb4cc64 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 28 二月 2026 20:31:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
index a4ea4c0..d3c6fd2 100644
--- a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
+++ b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
@@ -30,7 +30,8 @@
import com.xiaopeng.api.vo.automaticPilot.protobuf.*;
import com.xiaopeng.api.vo.automaticPilot.protobuf.AbnormalReason;
import com.xiaopeng.api.vo.automaticPilot.protobuf.GearLevel;
-import com.xiaopeng.api.vo.automaticPilot.protobuf.OrderPhase;import com.xiaopeng.api.vo.automaticPilot.protobuf.OrderStatusInfo;
+import com.xiaopeng.api.vo.automaticPilot.protobuf.OrderPhase;
+import com.xiaopeng.api.vo.automaticPilot.protobuf.OrderStatusInfo;
import com.xiaopeng.api.vo.automaticPilot.protobuf.RealtimePose;
import com.xiaopeng.api.vo.automaticPilot.protobuf.ResponseMessage;
import com.xiaopeng.api.vo.automaticPilot.protobuf.RtTripInfo;
@@ -357,14 +358,8 @@
cancelTaxiPassengerVo.setVin(vehicle.getVehicleVin());
cancelTaxiPassengerVo.setUid(xpOrder.getAppUserId().toString());
cancelTaxiPassengerVo.setOrderNo(xpOrder.getOrderNumber());
- // TODO
-// cancelTaxiPassengerVo.setAppId();
userVehicleClient.cancelTaxiPassenger(cancelTaxiPassengerVo);
}
- // 取消订单
-// R<?> r = xpOrderClient.cancelOrder(String.valueOf(xpOrder.getId()));
-// if (r.getCode() == R.SUCCESS){
- log.info("取消订单成功");
// TODO 重新派单
ReassignOrderDTO reassignOrderDTO = new ReassignOrderDTO();
reassignOrderDTO.setUid(xpOrder.getAppUserId().toString());
@@ -377,7 +372,6 @@
reassignOrderDTO.setLongitude(longitude);
reassignOrderDTO.setLatitude(latitude);
reassignOrderClient.reassignOrder(reassignOrderDTO);
-// }
}
}
@@ -866,7 +860,7 @@
- com.xiaopeng.api.vo.automaticPilot.protobuf.RtTask.Builder taskBuilder = com.xiaopeng.api.vo.automaticPilot.protobuf.RtTask.newBuilder();
+ RtTask.Builder taskBuilder = RtTask.newBuilder();
taskBuilder.setOrderId(lastXpCruiseOrder.getId());
taskBuilder.setTaskId("MISSION_"+ IdUtil.fastUUID());
taskBuilder.setTaskType(com.xiaopeng.api.vo.automaticPilot.protobuf.OrderType.ORDER_TYPE_CRUISE);
--
Gitblit v1.7.1