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/TripsReportProvider.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/TripsReportProvider.java')
-rw-r--r-- | src/main/java/org/traccar/reports/TripsReportProvider.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/main/java/org/traccar/reports/TripsReportProvider.java b/src/main/java/org/traccar/reports/TripsReportProvider.java index 5e598cb50..a8e0e3dde 100644 --- a/src/main/java/org/traccar/reports/TripsReportProvider.java +++ b/src/main/java/org/traccar/reports/TripsReportProvider.java @@ -18,14 +18,13 @@ package org.traccar.reports; import org.apache.poi.ss.util.WorkbookUtil; import org.traccar.Context; -import org.traccar.Main; -import org.traccar.database.DeviceManager; -import org.traccar.database.IdentityManager; +import org.traccar.helper.model.PositionUtil; import org.traccar.model.Device; import org.traccar.model.Group; import org.traccar.reports.common.ReportUtils; import org.traccar.reports.model.DeviceReportSection; import org.traccar.reports.model.TripReportItem; +import org.traccar.storage.Storage; import org.traccar.storage.StorageException; import javax.inject.Inject; @@ -40,21 +39,20 @@ import java.util.Date; public class TripsReportProvider { private final ReportUtils reportUtils; + private final Storage storage; @Inject - public TripsReportProvider(ReportUtils reportUtils) { + public TripsReportProvider(ReportUtils reportUtils, Storage storage) { this.reportUtils = reportUtils; + this.storage = storage; } private Collection<TripReportItem> detectTrips(long deviceId, Date from, Date to) throws StorageException { boolean ignoreOdometer = Context.getDeviceManager() .lookupAttributeBoolean(deviceId, "report.ignoreOdometer", false, false, true); - IdentityManager identityManager = Main.getInjector().getInstance(IdentityManager.class); - DeviceManager deviceManager = Main.getInjector().getInstance(DeviceManager.class); - return reportUtils.detectTripsAndStops( - Context.getDataManager().getPositions(deviceId, from, to), ignoreOdometer, TripReportItem.class); + PositionUtil.getPositions(storage, deviceId, from, to), ignoreOdometer, TripReportItem.class); } public Collection<TripReportItem> getObjects(long userId, Collection<Long> deviceIds, Collection<Long> groupIds, |