From e21a938f55e9a9260917c87a650a45afdadc2fb3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 07 三月 2026 21:01:49 +0800
Subject: [PATCH] 添加派单流程日志
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 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 986cbe9..e3c6fd2 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
@@ -5,12 +5,10 @@
import com.xiaopeng.api.dto.map.RouteAndFareDto;
import com.xiaopeng.api.dto.operation.LonLatDto;
import com.xiaopeng.api.dto.operation.VehiclePositionByVinDto;
-import com.xiaopeng.api.dto.vehicleConvoy.BaseVehicleUserDto;
import com.xiaopeng.api.feignClient.automaticPilot.OrderMissionClient;
import com.xiaopeng.api.feignClient.map.XpMapClient;
import com.xiaopeng.api.feignClient.order.XpCruiseOrderClient;
import com.xiaopeng.api.feignClient.order.XpOrderClient;
-import com.xiaopeng.api.feignClient.vehicleConvoy.UserVehicleClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.operation.XpElectronicFence;
import com.xiaopeng.api.model.operation.XpTradingStrategy;
@@ -20,7 +18,6 @@
import com.xiaopeng.api.vo.automaticPilot.VehiclePosition;
import com.xiaopeng.api.vo.operation.RouteVo;
import com.xiaopeng.api.vo.operation.VehiclePositionVo;
-import com.xiaopeng.api.vo.vehicleConvoy.AddTaxiPassengerVo;
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.redis.service.RedisService;
@@ -102,12 +99,10 @@
*/
@Scheduled(cron = "0/5 * * * * ?")
public void taskOrder() {
- log.info("5秒执行一次");
+ System.out.println("5秒执行一次");
Set<String> quoteMatchName = redisService.getQuoteMatchName(CacheConstants.QUEUE_POINT_ID);
- log.info("quoteMatchName:{}", quoteMatchName);
for (String name : quoteMatchName) {
String firstElement = redisService.getFirstElement(name);
- log.info("firstElement:{}", firstElement);
if (firstElement != null) {
String[] split = firstElement.toString().split("_");
// 如果未处理 创建新任务
@@ -130,7 +125,7 @@
* @param firstElement 队列第一个元素
*/
private void orderProcess(String quoteName, String firstElement) {
- log.info("进入处理环节 quoteName:{} firstElement:{}", quoteName, firstElement);
+ System.out.println("进入处理环节");
XpTradingStrategy xpTradingStrategy = xpTradingStrategyService.getOne(null);
String orderId = firstElement.split("_")[0];
String lonLat = firstElement.split("_")[1];
@@ -234,7 +229,7 @@
*/
@SneakyThrows
private void processPushOrder(String quoteName, int count, String uid, String[] split, String orderNo, XpTradingStrategy xpTradingStrategy, String distance, String duration, String planRule) {
- log.info("进入推单环环节 orderNo: {}, quoteName:{} distance:{} duration:{} planRule:{}", orderNo, quoteName, distance, duration, planRule);
+ System.out.println("进入推单环环节");
if (count == 0) {
count = 1;
}
@@ -255,13 +250,13 @@
for (int i = 0; i < count; i++) {
- log.info("进入找车环节 orderNo: {}", orderNo);
+ System.out.println("进入找车环节");
// 根据距离找车
// 车多则根据配置找具体车数量 根据距离最近
// 更改 暂不限制数量
List<VehiclePosition> positionList = vehiclePositionService.findAvailableVehiclesNearby(Double.parseDouble(split[0]), Double.parseDouble(split[1]), xpTradingStrategy.getOnePushDistance(), xpTradingStrategy.getSimultaneouslyOrderCount());
-
+ log.info("根据距离找车 {}", positionList);
// 获取车辆的区域信息
if (positionList.isEmpty()) {
continue;
@@ -270,10 +265,10 @@
// 获取车辆的信息 筛选出可用车辆
R<List<String>> vehiclePositionVos = xpVehicleClient.queryVehiclePositionByVin(new VehiclePositionByVinDto(xpElectronicFence.getId(), vinList, xpTradingStrategy.getSimultaneouslyOrderCount()));
+ log.info("筛选可用车辆结果 {}", vehiclePositionVos);
if (vehiclePositionVos.getCode() != 200) {
continue;
}
-
List<VehiclePositionVo> availableVehiclesNearby = BeanUtil.copyToList(positionList, VehiclePositionVo.class);
List<String> data = vehiclePositionVos.getData();
@@ -767,7 +762,7 @@
RLock lock = redissonClient.getLock("FIND_CAR_" + vehiclePositionVo.getVin());
lock.lock(10, TimeUnit.SECONDS);
- log.error("队列：" + quoteName + " 车辆：" + vehiclePositionVo.getVin() + "订单" + orderNo);
+ System.err.println("队列：" + quoteName + " 车辆：" + vehiclePositionVo.getVin() + "订单" + orderNo);
try {
// VehiclePosition vehiclePosition = vehiclePositionService.findByVehicleId(vehiclePositionVo.getVehicle_id());
R<XpVehicle> vehiclePositionR = xpVehicleClient.findByVehicleVin(vehiclePositionVo.getVin());
@@ -866,7 +861,7 @@
*/
@SneakyThrows
public void reassignPushOrder(int count, String uid, Double longitude, Double latitude, String orderNo) {
- log.info("进入推单环环节 orderNo:{} longitude:{} latitude:{}", orderNo, longitude, latitude);
+ System.out.println("进入推单环环节");
if (count == 0) {
count = 1;
}
@@ -881,7 +876,7 @@
XpOrder data = xpOrderR.getData();
XpTradingStrategy xpTradingStrategy = xpTradingStrategyService.getOne(null);
for (int i = 0; i < count; i++) {
- log.info("进入找车环节 orderNo:{} longitude:{} latitude:{}", orderNo, longitude, latitude);
+ log.info("进入找车环节");
List<VehiclePosition> positionList = vehiclePositionService.findAvailableVehiclesNearby(longitude, latitude, xpTradingStrategy.getOnePushDistance(), xpTradingStrategy.getSimultaneouslyOrderCount());
// 获取车辆的区域信息
--
Gitblit v1.7.1