diff options
author | Anton Tananaev <anton@traccar.org> | 2023-03-26 06:54:29 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2023-03-26 06:54:29 -0700 |
commit | 3082f7b3e5bfd00ec6f6801222060dfc0d10b7e0 (patch) | |
tree | 688ca698b70bb18aa79bf0f0434923857c26dca4 /src/main/java/org/traccar/reports/RouteReportProvider.java | |
parent | e6960c3d49025eb63243052e4c7aedde9955fe40 (diff) | |
download | trackermap-server-3082f7b3e5bfd00ec6f6801222060dfc0d10b7e0.tar.gz trackermap-server-3082f7b3e5bfd00ec6f6801222060dfc0d10b7e0.tar.bz2 trackermap-server-3082f7b3e5bfd00ec6f6801222060dfc0d10b7e0.zip |
Implement group commands
Diffstat (limited to 'src/main/java/org/traccar/reports/RouteReportProvider.java')
-rw-r--r-- | src/main/java/org/traccar/reports/RouteReportProvider.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/reports/RouteReportProvider.java b/src/main/java/org/traccar/reports/RouteReportProvider.java index 3ee651619..6d44259e6 100644 --- a/src/main/java/org/traccar/reports/RouteReportProvider.java +++ b/src/main/java/org/traccar/reports/RouteReportProvider.java @@ -19,6 +19,7 @@ package org.traccar.reports; import org.apache.poi.ss.util.WorkbookUtil; import org.traccar.config.Config; import org.traccar.config.Keys; +import org.traccar.helper.model.DeviceUtil; import org.traccar.helper.model.PositionUtil; import org.traccar.model.Device; import org.traccar.model.Group; @@ -60,7 +61,7 @@ public class RouteReportProvider { reportUtils.checkPeriodLimit(from, to); ArrayList<Position> result = new ArrayList<>(); - for (Device device: reportUtils.getAccessibleDevices(userId, deviceIds, groupIds)) { + for (Device device: DeviceUtil.getAccessibleDevices(storage, userId, deviceIds, groupIds)) { result.addAll(PositionUtil.getPositions(storage, device.getId(), from, to)); } return result; @@ -73,7 +74,7 @@ public class RouteReportProvider { ArrayList<DeviceReportSection> devicesRoutes = new ArrayList<>(); ArrayList<String> sheetNames = new ArrayList<>(); - for (Device device: reportUtils.getAccessibleDevices(userId, deviceIds, groupIds)) { + for (Device device: DeviceUtil.getAccessibleDevices(storage, userId, deviceIds, groupIds)) { var positions = PositionUtil.getPositions(storage, device.getId(), from, to); DeviceReportSection deviceRoutes = new DeviceReportSection(); deviceRoutes.setDeviceName(device.getName()); |