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/SummaryReportProvider.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/SummaryReportProvider.java')
-rw-r--r-- | src/main/java/org/traccar/reports/SummaryReportProvider.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/reports/SummaryReportProvider.java b/src/main/java/org/traccar/reports/SummaryReportProvider.java index 1f136adeb..26d79c899 100644 --- a/src/main/java/org/traccar/reports/SummaryReportProvider.java +++ b/src/main/java/org/traccar/reports/SummaryReportProvider.java @@ -23,6 +23,7 @@ import org.traccar.config.Keys; import org.traccar.helper.UnitsConverter; import org.traccar.helper.model.PositionUtil; import org.traccar.helper.model.UserUtil; +import org.traccar.model.Device; import org.traccar.model.Position; import org.traccar.reports.common.ReportUtils; import org.traccar.reports.model.SummaryReportItem; @@ -145,11 +146,11 @@ public class SummaryReportProvider { long userId, Collection<Long> deviceIds, Collection<Long> groupIds, Date from, Date to, boolean daily) throws StorageException { reportUtils.checkPeriodLimit(from, to); - reportUtils.checkPermissions(userId, deviceIds, groupIds); ArrayList<SummaryReportItem> result = new ArrayList<>(); - for (long deviceId: reportUtils.getDeviceList(deviceIds, groupIds)) { - Collection<SummaryReportItem> deviceResults = calculateSummaryResults(userId, deviceId, from, to, daily); + for (Device device: reportUtils.getAccessibleDevices(userId, deviceIds, groupIds)) { + Collection<SummaryReportItem> deviceResults = + calculateSummaryResults(userId, device.getId(), from, to, daily); for (SummaryReportItem summaryReport : deviceResults) { if (summaryReport.getStartTime() != null && summaryReport.getEndTime() != null) { result.add(summaryReport); |