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/SummaryReportProvider.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/SummaryReportProvider.java')
-rw-r--r-- | src/main/java/org/traccar/reports/SummaryReportProvider.java | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/main/java/org/traccar/reports/SummaryReportProvider.java b/src/main/java/org/traccar/reports/SummaryReportProvider.java index 26d79c899..02033b9e5 100644 --- a/src/main/java/org/traccar/reports/SummaryReportProvider.java +++ b/src/main/java/org/traccar/reports/SummaryReportProvider.java @@ -58,11 +58,10 @@ public class SummaryReportProvider { this.storage = storage; } - private SummaryReportItem calculateSummaryResult( - long deviceId, Collection<Position> positions) throws StorageException { + private SummaryReportItem calculateSummaryResult(Device device, Collection<Position> positions) { SummaryReportItem result = new SummaryReportItem(); - result.setDeviceId(deviceId); - result.setDeviceName(reportUtils.getDevice(deviceId).getName()); + result.setDeviceId(device.getId()); + result.setDeviceName(device.getName()); if (positions != null && !positions.isEmpty()) { Position firstPosition = null; Position previousPosition = null; @@ -119,9 +118,9 @@ public class SummaryReportProvider { } private Collection<SummaryReportItem> calculateSummaryResults( - long userId, long deviceId, Date from, Date to, boolean daily) throws StorageException { + long userId, Device device, Date from, Date to, boolean daily) throws StorageException { - var positions = PositionUtil.getPositions(storage, deviceId, from, to); + var positions = PositionUtil.getPositions(storage, device.getId(), from, to); var results = new ArrayList<SummaryReportItem>(); if (daily && !positions.isEmpty()) { int startIndex = 0; @@ -129,14 +128,14 @@ public class SummaryReportProvider { for (int i = 0; i < positions.size(); i++) { int currentDay = getDay(userId, positions.get(i).getFixTime()); if (currentDay != startDay) { - results.add(calculateSummaryResult(deviceId, positions.subList(startIndex, i))); + results.add(calculateSummaryResult(device, positions.subList(startIndex, i))); startIndex = i; startDay = currentDay; } } - results.add(calculateSummaryResult(deviceId, positions.subList(startIndex, positions.size()))); + results.add(calculateSummaryResult(device, positions.subList(startIndex, positions.size()))); } else { - results.add(calculateSummaryResult(deviceId, positions)); + results.add(calculateSummaryResult(device, positions)); } return results; @@ -149,8 +148,7 @@ public class SummaryReportProvider { ArrayList<SummaryReportItem> result = new ArrayList<>(); for (Device device: reportUtils.getAccessibleDevices(userId, deviceIds, groupIds)) { - Collection<SummaryReportItem> deviceResults = - calculateSummaryResults(userId, device.getId(), from, to, daily); + Collection<SummaryReportItem> deviceResults = calculateSummaryResults(userId, device, from, to, daily); for (SummaryReportItem summaryReport : deviceResults) { if (summaryReport.getStartTime() != null && summaryReport.getEndTime() != null) { result.add(summaryReport); |