From 979f873b0f87ba66e6eae46abc39e3d74fd1c88c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 07 三月 2026 21:01:57 +0800
Subject: [PATCH] 修改推单逻辑bug及日志排查
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
index bc74c00..f5ee65f 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -31,7 +31,6 @@
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
@@ -49,35 +48,38 @@
@Resource
private RedisService redisService;
- @Autowired
+ @Resource
private XpPointService xpPointService;
- @Autowired
+ @Resource
private IXpElectronicFenceAreaService xpElectronicFenceAreaService;
- @Autowired
+ @Resource
private XpOrderClient xpOrderClient;
- @Autowired
+ @Resource
private VehiclePositionService vehiclePositionService;
- @Autowired
+ @Resource
private IXpTradingStrategyService xpTradingStrategyService;
- @Autowired
+ @Resource
private XpCruiseOrderClient xpCruiseOrderClient;
- @Autowired
+ @Resource
private XpVehicleClient xpVehicleClient;
- @Autowired
+ @Resource
private RedissonClient redissonClient;
- @Autowired
+ @Resource
private XpMapClient xpMapClient;
//
- @Autowired
+ @Resource
private OrderMissionClient orderMissionClient;
+
+ @Resource
+ private XpElectronicFenceMapper xpElectronicFenceMapper;
// 自定义线程池
@@ -91,9 +93,6 @@
threadPoolTaskExecutor.setThreadNamePrefix("taskOrder-");
threadPoolTaskExecutor.initialize();
}
-
- @Autowired
- private XpElectronicFenceMapper xpElectronicFenceMapper;
/**
* 5秒执行一次
@@ -780,7 +779,11 @@
continue;
}
// 关闭巡游单子
- xpCruiseOrderClient.updateCruiseOrder(vehiclePosition.getVehicleVin());
+ R<String> stringR = xpCruiseOrderClient.updateCruiseOrder(vehiclePosition.getVehicleVin());
+ if(stringR ==null || stringR.getData()==null){
+ log.info("关闭巡游单子失败");
+ continue;
+ }
// 下发命令
PushOrderDto pushOrderDto = new PushOrderDto();
@@ -826,7 +829,12 @@
continue;
}
// 关闭巡游单子
- xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());
+ R<String> stringR = xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());
+ if(stringR ==null || stringR.getData()==null){
+ log.info("关闭巡游单子失败");
+ continue;
+ }
+
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(vehiclePosition.getVin());
@@ -906,7 +914,11 @@
continue;
}
// 关闭巡游单子
- xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());
+ R<String> stringR = xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());
+ if(stringR ==null || stringR.getData()==null){
+ log.info("关闭巡游单子失败");
+ continue;
+ }
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(vehiclePosition.getVin());
--
Gitblit v1.7.1