diff options
author | Anton Tananaev <anton@traccar.org> | 2022-06-13 17:19:15 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-06-13 17:19:15 -0700 |
commit | e894c17cf14addb729a6c51712ef672cc2cd160b (patch) | |
tree | 2f9b239d3445bf60e26baab0dbf7658b6ec841f5 /src/main/java/org/traccar/reports/RouteReportProvider.java | |
parent | 75044332bebdd8bf3d77431a7008d617dc5f5986 (diff) | |
download | trackermap-server-e894c17cf14addb729a6c51712ef672cc2cd160b.tar.gz trackermap-server-e894c17cf14addb729a6c51712ef672cc2cd160b.tar.bz2 trackermap-server-e894c17cf14addb729a6c51712ef672cc2cd160b.zip |
Refactor getPositions method
Diffstat (limited to 'src/main/java/org/traccar/reports/RouteReportProvider.java')
-rw-r--r-- | src/main/java/org/traccar/reports/RouteReportProvider.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/reports/RouteReportProvider.java b/src/main/java/org/traccar/reports/RouteReportProvider.java index 136a154aa..dbbf0906d 100644 --- a/src/main/java/org/traccar/reports/RouteReportProvider.java +++ b/src/main/java/org/traccar/reports/RouteReportProvider.java @@ -18,11 +18,13 @@ package org.traccar.reports; import org.apache.poi.ss.util.WorkbookUtil; import org.traccar.Context; +import org.traccar.helper.model.PositionUtil; import org.traccar.model.Device; import org.traccar.model.Group; import org.traccar.model.Position; import org.traccar.reports.common.ReportUtils; import org.traccar.reports.model.DeviceReportSection; +import org.traccar.storage.Storage; import org.traccar.storage.StorageException; import javax.inject.Inject; @@ -37,10 +39,12 @@ import java.util.Date; public class RouteReportProvider { private final ReportUtils reportUtils; + private final Storage storage; @Inject - public RouteReportProvider(ReportUtils reportUtils) { + public RouteReportProvider(ReportUtils reportUtils, Storage storage) { this.reportUtils = reportUtils; + this.storage = storage; } public Collection<Position> getObjects(long userId, Collection<Long> deviceIds, Collection<Long> groupIds, @@ -49,7 +53,7 @@ public class RouteReportProvider { ArrayList<Position> result = new ArrayList<>(); for (long deviceId: reportUtils.getDeviceList(deviceIds, groupIds)) { Context.getPermissionsManager().checkDevice(userId, deviceId); - result.addAll(Context.getDataManager().getPositions(deviceId, from, to)); + result.addAll(PositionUtil.getPositions(storage, deviceId, from, to)); } return result; } @@ -62,8 +66,7 @@ public class RouteReportProvider { ArrayList<String> sheetNames = new ArrayList<>(); for (long deviceId: reportUtils.getDeviceList(deviceIds, groupIds)) { Context.getPermissionsManager().checkDevice(userId, deviceId); - Collection<Position> positions = Context.getDataManager() - .getPositions(deviceId, from, to); + var positions = PositionUtil.getPositions(storage, deviceId, from, to); DeviceReportSection deviceRoutes = new DeviceReportSection(); Device device = Context.getIdentityManager().getById(deviceId); deviceRoutes.setDeviceName(device.getName()); |