合并代码

puzhibing

2026-05-11 0310e854ca345f699b2ea8e94d14fc0ecbeb4f50

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java

@@ -204,17 +204,17 @@
        List<NearestNextVo> objects = new ArrayList<NearestNextVo>();
        if (!nearestNextVos.isEmpty()) {
            //收藏的数据
            List<NearestNextVo> collect = nearestNextVos.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
            collect.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
            List<NearestNextVo> collect = nearestNextVos.stream().filter(s -> s.getIsCollect() == 1)
                    .sorted(Comparator.comparing(NearestNextVo::getDistance)).collect(Collectors.toList());
            objects.addAll(collect);
            //非收藏的数据
            List<NearestNextVo> collect1 = nearestNextVos.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
            collect1.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
            List<NearestNextVo> collect1 = nearestNextVos.stream().filter(s -> s.getIsCollect() == 2)
                    .sorted(Comparator.comparing(NearestNextVo::getDistance)).collect(Collectors.toList());
            objects.addAll(collect1);

        }
        nearestVo.setPoints(nearestNextVos);
        nearestVo.setTotal(nearestNextVos.size());
        nearestVo.setPoints(objects);
        nearestVo.setTotal(objects.size());
        return nearestVo;

    }