From e1890b66e665c8860de00809f90ac57f5af651ba Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 19 三月 2026 15:43:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 2f02286..e195114 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
@@ -1,8 +1,7 @@
package com.xiaopeng.operation.utils;
import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
import com.xiaopeng.api.dto.automaticPilot.PushOrderDto;
import com.xiaopeng.api.dto.map.RouteAndFareDto;
import com.xiaopeng.api.dto.operation.LonLatDto;
@@ -350,6 +349,9 @@
}
}
+
+ // 距离差
+
if (max1.equals(weightDistanceDifference)) {
for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) {
RouteAndFareDto routeAndFareDto = new RouteAndFareDto();
@@ -400,10 +402,10 @@
// 分数计算 把时间短的分数调高
availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getDistance)).collect(Collectors.toList());
- for (int count1 = 0; count1 < availableVehiclesNearby.size(); count1++) {
- VehiclePositionVo vehiclePosition = availableVehiclesNearby.get(count1);
- VehiclePositionVo vehiclePosition1 = availableVehiclesNearby.get(availableVehiclesNearby.size()-count1-1);
- vehiclePosition.setDistance(vehiclePosition1.getDistance());
+ double score = 10;
+ for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) {
+ vehiclePosition.setDistance(score);
+ score--;
}
}
@@ -432,10 +434,10 @@
}
// 分数计算 把时间短的分数调高
availableVehiclesNearby = availableVehiclesNearby.stream().sorted(Comparator.comparing(VehiclePositionVo::getSecond)).collect(Collectors.toList());
- for (int count1 = 0; count1 < availableVehiclesNearby.size(); count1++) {
- VehiclePositionVo vehiclePosition = availableVehiclesNearby.get(count1);
- VehiclePositionVo vehiclePosition1 = availableVehiclesNearby.get(availableVehiclesNearby.size()-count1-1);
- vehiclePosition.setSecond(vehiclePosition1.getSecond());
+ int score = 10;
+ for (VehiclePositionVo vehiclePosition : availableVehiclesNearby) {
+ vehiclePosition.setSecond(score);
+ score--;
}
}
--
Gitblit v1.7.1