diff options
author | Anton Tananaev <anton@traccar.org> | 2022-06-28 07:39:33 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-06-28 07:39:33 -0700 |
commit | 9e07a009a3da41cd3cdd21809e9588e1ed133d6f (patch) | |
tree | 870e65c2519c77943e11623763c514575a6903c0 /src/main/java/org/traccar/reports/StopsReportProvider.java | |
parent | 3c48c66cf55705274ff482cf3deefee11196ddfe (diff) | |
download | trackermap-server-9e07a009a3da41cd3cdd21809e9588e1ed133d6f.tar.gz trackermap-server-9e07a009a3da41cd3cdd21809e9588e1ed133d6f.tar.bz2 trackermap-server-9e07a009a3da41cd3cdd21809e9588e1ed133d6f.zip |
Fix device name in reports
Diffstat (limited to 'src/main/java/org/traccar/reports/StopsReportProvider.java')
-rw-r--r-- | src/main/java/org/traccar/reports/StopsReportProvider.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/traccar/reports/StopsReportProvider.java b/src/main/java/org/traccar/reports/StopsReportProvider.java index 6e4cd74d6..ba61ef6a1 100644 --- a/src/main/java/org/traccar/reports/StopsReportProvider.java +++ b/src/main/java/org/traccar/reports/StopsReportProvider.java @@ -55,10 +55,10 @@ public class StopsReportProvider { this.storage = storage; } - private Collection<StopReportItem> detectStops(long deviceId, Date from, Date to) throws StorageException { + private Collection<StopReportItem> detectStops(Device device, Date from, Date to) throws StorageException { boolean ignoreOdometer = config.getBoolean(Keys.REPORT_IGNORE_ODOMETER); - return reportUtils.detectTripsAndStops( - PositionUtil.getPositions(storage, deviceId, from, to), ignoreOdometer, StopReportItem.class); + var positions = PositionUtil.getPositions(storage, device.getId(), from, to); + return reportUtils.detectTripsAndStops(device, positions, ignoreOdometer, StopReportItem.class); } public Collection<StopReportItem> getObjects( @@ -68,7 +68,7 @@ public class StopsReportProvider { ArrayList<StopReportItem> result = new ArrayList<>(); for (Device device: reportUtils.getAccessibleDevices(userId, deviceIds, groupIds)) { - result.addAll(detectStops(device.getId(), from, to)); + result.addAll(detectStops(device, from, to)); } return result; } @@ -81,7 +81,7 @@ public class StopsReportProvider { ArrayList<DeviceReportSection> devicesStops = new ArrayList<>(); ArrayList<String> sheetNames = new ArrayList<>(); for (Device device: reportUtils.getAccessibleDevices(userId, deviceIds, groupIds)) { - Collection<StopReportItem> stops = detectStops(device.getId(), from, to); + Collection<StopReportItem> stops = detectStops(device, from, to); DeviceReportSection deviceStops = new DeviceReportSection(); deviceStops.setDeviceName(device.getName()); sheetNames.add(WorkbookUtil.createSafeSheetName(deviceStops.getDeviceName())); |