修改

xuhy

2024-10-26 e8f4289bce6a4cf7cb81d18de71a49e95b067627

修改

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java

@@ -328,9 +328,15 @@
        }
        // 查询所有的停车场的站点id
        List<TParkingLot> list = parkingLotService.list();
        List<Integer> siteIds = list.stream().map(TParkingLot::getSiteId).collect(Collectors.toList());
        List<Integer> siteIds = list.stream().map(TParkingLot::getSiteId).distinct().collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(ids) && !CollectionUtils.isEmpty(siteIds)){
            ids.addAll(siteIds);
            Iterator<Integer> iterator = ids.iterator();
            while (iterator.hasNext()){
                Integer next = iterator.next();
                if(siteIds.contains(next)){
                    iterator.remove();
                }
            }
        }
        return this.baseMapper.getSiteListParkLot(ids);
    }

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java

@@ -112,7 +112,7 @@
        query.with(pageable);

        List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringData = mongoTemplate.find(
                query.with(Sort.by("create_time"))
                query.with(Sort.by(Sort.Direction.DESC,"create_time"))
                , UploadRealTimeMonitoringData.class);
        return uploadRealTimeMonitoringData;
    }