diff options
author | Anton Tananaev <anton@traccar.org> | 2022-06-18 12:22:21 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-06-18 12:22:21 -0700 |
commit | 24140619789c88d96364673240b172bbd2ae2c82 (patch) | |
tree | 30b0ec3b091bf95e6edea42297b4163d15b491c4 /src/main/java/org/traccar/reports/TripsReportProvider.java | |
parent | 895e89504ff0ef6fe05e2a74847f9aa582a9d270 (diff) | |
download | trackermap-server-24140619789c88d96364673240b172bbd2ae2c82.tar.gz trackermap-server-24140619789c88d96364673240b172bbd2ae2c82.tar.bz2 trackermap-server-24140619789c88d96364673240b172bbd2ae2c82.zip |
Refactor reports dependencies
Diffstat (limited to 'src/main/java/org/traccar/reports/TripsReportProvider.java')
-rw-r--r-- | src/main/java/org/traccar/reports/TripsReportProvider.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/org/traccar/reports/TripsReportProvider.java b/src/main/java/org/traccar/reports/TripsReportProvider.java index 95612ab30..7d10879b7 100644 --- a/src/main/java/org/traccar/reports/TripsReportProvider.java +++ b/src/main/java/org/traccar/reports/TripsReportProvider.java @@ -64,11 +64,10 @@ public class TripsReportProvider { public Collection<TripReportItem> getObjects(long userId, Collection<Long> deviceIds, Collection<Long> groupIds, Date from, Date to) throws StorageException { reportUtils.checkPeriodLimit(from, to); - reportUtils.checkPermissions(userId, deviceIds, groupIds); ArrayList<TripReportItem> result = new ArrayList<>(); - for (long deviceId: reportUtils.getDeviceList(deviceIds, groupIds)) { - result.addAll(detectTrips(deviceId, from, to)); + for (Device device: reportUtils.getAccessibleDevices(userId, deviceIds, groupIds)) { + result.addAll(detectTrips(device.getId(), from, to)); } return result; } @@ -77,14 +76,12 @@ public class TripsReportProvider { long userId, Collection<Long> deviceIds, Collection<Long> groupIds, Date from, Date to) throws StorageException, IOException { reportUtils.checkPeriodLimit(from, to); - reportUtils.checkPermissions(userId, deviceIds, groupIds); ArrayList<DeviceReportSection> devicesTrips = new ArrayList<>(); ArrayList<String> sheetNames = new ArrayList<>(); - for (long deviceId: reportUtils.getDeviceList(deviceIds, groupIds)) { - Collection<TripReportItem> trips = detectTrips(deviceId, from, to); + for (Device device: reportUtils.getAccessibleDevices(userId, deviceIds, groupIds)) { + Collection<TripReportItem> trips = detectTrips(device.getId(), from, to); DeviceReportSection deviceTrips = new DeviceReportSection(); - Device device = reportUtils.getDevice(deviceId); deviceTrips.setDeviceName(device.getName()); sheetNames.add(WorkbookUtil.createSafeSheetName(deviceTrips.getDeviceName())); if (device.getGroupId() > 0) { |