From 40c1c6d5aa4f8d1d71a2bdb957e5a7a25429f22d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 21 四月 2026 15:07:31 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java | 41 +++--------------------------------------
1 files changed, 3 insertions(+), 38 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 745a6fe..f45d6ba 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
@@ -73,7 +73,6 @@
@Service
public class KafkaConsumerService {
private static final String REASSIGN_CANCEL_CONTEXT_PREFIX = "REASSIGN_CANCEL_CONTEXT:";
- private static final String REASSIGN_CANCEL_CONTEXT_PREFIX = "REASSIGN_CANCEL_CONTEXT:";
private static final String CANCEL_ORDER_CONTEXT_PREFIX = "CANCEL_ORDER_CONTEXT:";
@@ -1291,7 +1290,7 @@
log.info("改派旧车取消回调，跳过订单取消处理，orderId: {}, taskId: {}, cancelScene: {}, context: {}",
orderId, taskId, reassignCancelContext.getString("cancelScene"), reassignCancelContext);
//响应消息
- String responseVin = resolveReassignCancelResponseVin(reassignCancelContext);
+ String responseVin = resolveReassignCancelResponseVin(orderId, reassignCancelContext);
if (StringUtils.isNotEmpty(responseVin)) {
responseMessage(cmd, sequence, responseVin);
} else {
@@ -1530,21 +1529,6 @@
}
/**
- * 兼容按订单维度缓存的改派取消上下文。
- * 该键在历史实现中使用，保留读取能力避免线上旧数据失效。
- */
- private JSONObject getReassignCancelContext(String orderId) {
- if (StringUtils.isEmpty(orderId)) {
- return null;
- }
- Object cacheObject = redisService.getCacheObject(REASSIGN_CANCEL_CONTEXT_PREFIX + orderId);
- if (cacheObject == null) {
- return null;
- }
- return JSON.parseObject(cacheObject.toString());
- }
-
- /**
* 当前 cancelOrder 指令是按 taskId 记录取消上下文。
* 改派旧车取消回调优先读取该上下文，避免依赖订单当前车/状态造成竞态误判。
*/
@@ -1589,14 +1573,13 @@
return cancelContext;
}
- private String resolveReassignCancelResponseVin(JSONObject cancelContext) {
+ private String resolveReassignCancelResponseVin(String orderId, JSONObject cancelContext) {
if (cancelContext == null) {
return null;
}
String vin = cancelContext.getString("vin");
if (StringUtils.isNotEmpty(vin)) {
return vin;
- return null;
}
if (CancelOrderSceneEnum.REASSIGN_OLD_VEHICLE != CancelOrderSceneEnum.fromCode(
cancelContext.getString("cancelScene"))) {
@@ -1613,7 +1596,7 @@
boolean vehicleMatched = Objects.nonNull(newVehicleId) && Objects.equals(newVehicleId, xpOrder.getVehicleId());
boolean statusMatched = Objects.nonNull(currentStatus) && currentStatus > 0 && currentStatus < 8;
if (vehicleMatched && statusMatched) {
- return cancelContext;
+ return newVehicleId.toString();
}
String oldVehicleVin = cancelContext.getString("oldVehicleVin");
if (StringUtils.isNotEmpty(oldVehicleVin)) {
@@ -1625,26 +1608,8 @@
}
R<XpVehicle> vehicleResult = xpVehicleClient.queryById(oldVehicleId);
XpVehicle xpVehicle = vehicleResult == null ? null : vehicleResult.getData();
- return xpVehicle == null ? null : xpVehicle.getVehicleVin();
log.info("改派取消回调未命中专用上下文，orderId: {}, currentVehicleId: {}, newVehicleId: {}, currentStatus: {}",
orderId, xpOrder.getVehicleId(), newVehicleId, currentStatus);
- return null;
- }
-
- private String resolveReassignCancelResponseVin(JSONObject cancelContext) {
- if (cancelContext == null) {
- return null;
- }
- String oldVehicleVin = cancelContext.getString("oldVehicleVin");
- if (StringUtils.isNotEmpty(oldVehicleVin)) {
- return oldVehicleVin;
- }
- Long oldVehicleId = cancelContext.getLong("oldVehicleId");
- if (Objects.isNull(oldVehicleId)) {
- return null;
- }
- R<XpVehicle> vehicleResult = xpVehicleClient.queryById(oldVehicleId);
- XpVehicle xpVehicle = vehicleResult == null ? null : vehicleResult.getData();
return xpVehicle == null ? null : xpVehicle.getVehicleVin();
}
--
Gitblit v1.7.1