From 2d365d982ca33840a086d8bf37646c4d0445d80b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 25 三月 2026 20:23:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 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 5ea91f7..b7a959d 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
@@ -521,15 +521,23 @@
vehiclePosition.setDistance(0.0);
}
}
+// availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getDistance)).collect(Collectors.toList());
+// int size = tendencyDistance;
+// // 做比对的分数
+// double temp = availableVehiclesNearby.get(0).getDistance();
+// for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) {
+// vehiclePosition.setDistanceScore(vehiclePosition.getDistanceScore() + size);
+// if (temp != vehiclePosition.getDistance()) {
+// size--;
+// }
+// }
+
+ // 分数计算 把时间短的分数调高
availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getDistance)).collect(Collectors.toList());
- int size = tendencyDistance;
- // 做比对的分数
- double temp = availableVehiclesNearby.get(0).getDistance();
+ int score = 10;
for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) {
- vehiclePosition.setDistanceScore(vehiclePosition.getDistanceScore() + size);
- if (temp != vehiclePosition.getDistance()) {
- size--;
- }
+ vehiclePosition.setDistanceScore(score);
+ score--;
}
}
@@ -558,16 +566,24 @@
vehiclePosition.setSecond(0);
}
}
+
+ // 分数计算 把时间短的分数调高
availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getSecond)).collect(Collectors.toList());
- int size = tendencyTime;
- // 做比对的分数
- double temp = availableVehiclesNearby.get(0).getSecond();
+ int score = 10;
for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) {
- vehiclePosition.setTimeScore(vehiclePosition.getTimeScore() + size);
- if (temp != vehiclePosition.getSecond()) {
- size--;
- }
+ vehiclePosition.setTimeScore(score);
+ score--;
}
+// availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getSecond)).collect(Collectors.toList());
+// int size = tendencyTime;
+// // 做比对的分数
+// double temp = availableVehiclesNearby.get(0).getSecond();
+// for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) {
+// vehiclePosition.setTimeScore(vehiclePosition.getTimeScore() + size);
+// if (temp != vehiclePosition.getSecond()) {
+// size--;
+// }
+// }
}
--
Gitblit v1.7.1