From 1e2989fdc50019008cf0ecffea8fb20dc0049b70 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 五月 2026 19:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
index 169f428..8a414e4 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
@@ -204,12 +204,12 @@
List<NearestNextVo> objects = new ArrayList<NearestNextVo>();
if (!nearestNextVos.isEmpty()) {
//收藏的数据
- List<NearestNextVo> collect = nearestNextVos.stream().filter(s -> s.getIsCollect() == 1)
- .sorted(Comparator.comparing(NearestNextVo::getDistance).reversed()).collect(Collectors.toList());
+ List<NearestNextVo> collect = nearestNextVos.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
+ collect.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
objects.addAll(collect);
//非收藏的数据
- List<NearestNextVo> collect1 = nearestNextVos.stream().filter(s -> s.getIsCollect() == 2)
- .sorted(Comparator.comparing(NearestNextVo::getDistance).reversed()).collect(Collectors.toList());
+ List<NearestNextVo> collect1 = nearestNextVos.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
+ collect1.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
objects.addAll(collect1);
}
@@ -333,6 +333,9 @@
@Override
public List<XpHistoryStartPointsVo> getHistoryStartPoints(HistoryStartPointsDto historyStartPointsDto) {
List<XpPoint> xpPoints = this.baseMapper.selectBatchIds(historyStartPointsDto.getPointIds());
+ if(xpPoints.isEmpty()){
+ return new ArrayList<>();
+ }
ArrayList<XpHistoryStartPointsVo> resultList = new ArrayList<>(10);
LocalTime now = LocalTime.now();
@@ -414,6 +417,9 @@
@Override
public List<XpHistoryEndPointsVo> getHistoryEndPoints(HistoryEndPointsDto historyEndPointsDto) {
List<XpPoint> xpPoints = this.baseMapper.selectBatchIds(historyEndPointsDto.getPointIds());
+ if(xpPoints.isEmpty()){
+ return new ArrayList<XpHistoryEndPointsVo>();
+ }
ArrayList<XpHistoryEndPointsVo> resultList = new ArrayList<>(10);
LocalTime now = LocalTime.now();
--
Gitblit v1.7.1