diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-07-14 21:19:53 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-14 21:19:53 +1200 |
commit | 26f1cf12867d6f8bfe86d562a3beecb590b3a9b5 (patch) | |
tree | ef3b8d2644aae5c5263241640ebb2e2b251f7b0c /src/org/traccar/reports | |
parent | a2e1f56adf50746425565557dd38f0e2c81a0222 (diff) | |
parent | b6a318daabbaf485e327cab77adba98413462516 (diff) | |
download | traccar-server-26f1cf12867d6f8bfe86d562a3beecb590b3a9b5.tar.gz traccar-server-26f1cf12867d6f8bfe86d562a3beecb590b3a9b5.tar.bz2 traccar-server-26f1cf12867d6f8bfe86d562a3beecb590b3a9b5.zip |
Merge pull request #3349 from Abyss777/drivers
Drivers implementation
Diffstat (limited to 'src/org/traccar/reports')
-rw-r--r-- | src/org/traccar/reports/ReportUtils.java | 23 | ||||
-rw-r--r-- | src/org/traccar/reports/model/TripReport.java | 20 |
2 files changed, 43 insertions, 0 deletions
diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java index 71c567c29..bc58d28df 100644 --- a/src/org/traccar/reports/ReportUtils.java +++ b/src/org/traccar/reports/ReportUtils.java @@ -26,6 +26,7 @@ import org.jxls.transform.Transformer; import org.jxls.transform.poi.PoiTransformer; import org.jxls.util.TransformerFactory; import org.traccar.Context; +import org.traccar.model.Driver; import org.traccar.model.Position; import org.traccar.reports.model.BaseReport; import org.traccar.reports.model.StopReport; @@ -101,6 +102,25 @@ public final class ReportUtils { return 0; } + public static String findDriver(Position firstPosition, Position lastPosition) { + if (firstPosition.getAttributes().containsKey(Position.KEY_DRIVER_UNIQUE_ID)) { + return firstPosition.getString(Position.KEY_DRIVER_UNIQUE_ID); + } else if (lastPosition.getAttributes().containsKey(Position.KEY_DRIVER_UNIQUE_ID)) { + return lastPosition.getString(Position.KEY_DRIVER_UNIQUE_ID); + } + return null; + } + + public static String findDriverName(String driverUniqueId) { + if (driverUniqueId != null && Context.getDriversManager() != null) { + Driver driver = Context.getDriversManager().getDriverByUniqueId(driverUniqueId); + if (driver != null) { + return driver.getName(); + } + } + return null; + } + public static org.jxls.common.Context initializeContext(long userId) { org.jxls.common.Context jxlsContext = PoiTransformer.createInitialContext(); jxlsContext.putVar("distanceUnit", getDistanceUnit(userId)); @@ -176,6 +196,9 @@ public final class ReportUtils { trip.setMaxSpeed(speedMax); trip.setSpentFuel(calculateFuel(startTrip, endTrip)); + trip.setDriverUniqueId(findDriver(startTrip, endTrip)); + trip.setDriverName(findDriverName(trip.getDriverUniqueId())); + return trip; } diff --git a/src/org/traccar/reports/model/TripReport.java b/src/org/traccar/reports/model/TripReport.java index efe556f79..42a4240b7 100644 --- a/src/org/traccar/reports/model/TripReport.java +++ b/src/org/traccar/reports/model/TripReport.java @@ -145,4 +145,24 @@ public class TripReport extends BaseReport { public void setDuration(long duration) { this.duration = duration; } + + private String driverUniqueId; + + public String getDriverUniqueId() { + return driverUniqueId; + } + + public void setDriverUniqueId(String driverUniqueId) { + this.driverUniqueId = driverUniqueId; + } + + private String driverName; + + public String getDriverName() { + return driverName; + } + + public void setDriverName(String driverName) { + this.driverName = driverName; + } } |