From f8c54ebade0d00d7d98e8e694bd99531fae1b8ac Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 五月 2026 16:09:51 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 52b0046..169f428 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
@@ -189,6 +189,7 @@
nearestNextVo.setTime(xpPoint.getParkingTimeLimit());
nearestNextVo.setElectronicAreaId(xpPoint.getElectronicAreaId());
nearestNextVo.setStationId(xpPoint.getStationId()==null?null:xpPoint.getStationId().toString());
+ nearestNextVo.setIsCollect(2);
// 判断是否收藏
if(pointIdsByUserId.getData()!=null && !pointIdsByUserId.getData().isEmpty()){
@@ -200,8 +201,17 @@
nearestNextVos.add(nearestNextVo);
}
}
+ List<NearestNextVo> objects = new ArrayList<NearestNextVo>();
if (!nearestNextVos.isEmpty()) {
- nearestNextVos = nearestNextVos.stream().sorted(Comparator.comparing(NearestNextVo::getDistance)).collect(Collectors.toList());
+ //收藏的数据
+ List<NearestNextVo> collect = nearestNextVos.stream().filter(s -> s.getIsCollect() == 1)
+ .sorted(Comparator.comparing(NearestNextVo::getDistance).reversed()).collect(Collectors.toList());
+ objects.addAll(collect);
+ //非收藏的数据
+ List<NearestNextVo> collect1 = nearestNextVos.stream().filter(s -> s.getIsCollect() == 2)
+ .sorted(Comparator.comparing(NearestNextVo::getDistance).reversed()).collect(Collectors.toList());
+ objects.addAll(collect1);
+
}
nearestVo.setPoints(nearestNextVos);
nearestVo.setTotal(nearestNextVos.size());
--
Gitblit v1.7.1