aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/api/resource/ReportResource.java18
-rw-r--r--src/org/traccar/reports/General.java103
2 files changed, 121 insertions, 0 deletions
diff --git a/src/org/traccar/api/resource/ReportResource.java b/src/org/traccar/api/resource/ReportResource.java
index cf11cd4e4..0885a3638 100644
--- a/src/org/traccar/api/resource/ReportResource.java
+++ b/src/org/traccar/api/resource/ReportResource.java
@@ -12,6 +12,7 @@ import javax.ws.rs.core.Response.ResponseBuilder;
import org.traccar.api.BaseResource;
import org.traccar.reports.Events;
+import org.traccar.reports.General;
import org.traccar.reports.ReportUtils;
import org.traccar.reports.Route;
import org.traccar.web.JsonConverter;
@@ -54,4 +55,21 @@ public class ReportResource extends BaseResource {
return response.build();
}
+ @Path("general")
+ @GET
+ public Response getGeneral(
+ @QueryParam("deviceId") final List<Long> deviceIds, @QueryParam("groupId") final List<Long> groupIds,
+ @QueryParam("from") String from, @QueryParam("to") String to) throws SQLException {
+ if (getAcceptHeader().equals("application/ms-excel")) {
+ ResponseBuilder response = Response.ok(ReportUtils.getOut(General.getCsv(getUserId(), deviceIds, groupIds,
+ JsonConverter.parseDate(from), JsonConverter.parseDate(to))));
+ response.type("application/ms-excel");
+ return response.build();
+ }
+ ResponseBuilder response = Response.ok(General.getJson(getUserId(), deviceIds, groupIds,
+ JsonConverter.parseDate(from), JsonConverter.parseDate(to)));
+ response.type(MediaType.APPLICATION_JSON);
+ return response.build();
+ }
+
}
diff --git a/src/org/traccar/reports/General.java b/src/org/traccar/reports/General.java
new file mode 100644
index 000000000..bcf2312b2
--- /dev/null
+++ b/src/org/traccar/reports/General.java
@@ -0,0 +1,103 @@
+package org.traccar.reports;
+
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Date;
+
+import javax.json.Json;
+import javax.json.JsonObjectBuilder;
+
+import org.traccar.Context;
+import org.traccar.helper.DistanceCalculator;
+import org.traccar.model.Position;
+import org.traccar.web.CsvBuilder;
+import org.traccar.web.JsonConverter;
+
+public final class General {
+
+ private General() {
+ }
+
+ public static class GeneralResult {
+
+ private String deviceName;
+ public String getDeviceName() {
+ return deviceName;
+ }
+ public void setDeviceName(String deviceName) {
+ this.deviceName = deviceName;
+ }
+
+ private double distance = 0;
+ public double getDistance() {
+ return distance;
+ }
+ public void setDistance(double distance) {
+ this.distance = distance;
+ }
+
+ public void addDistance(double distance) {
+ this.distance += distance;
+ }
+
+ private double averageSpeed = 0;
+ public double getAverageSpeed() {
+ return averageSpeed;
+ }
+ public void setAverageSpeed(double averageSpeed) {
+ this.averageSpeed = averageSpeed;
+ }
+
+ private double maxSpeed = 0;
+ public double getMaxSpeed() {
+ return maxSpeed;
+ }
+ public void setMaxSpeed(double maxSpeed) {
+ if (maxSpeed > this.maxSpeed) {
+ this.maxSpeed = maxSpeed;
+ }
+ }
+ }
+
+ private static GeneralResult calculateGeneralResult(long deviceId, Date from, Date to) throws SQLException {
+ GeneralResult result = new GeneralResult();
+ Collection<Position> positions = Context.getDataManager().getPositions(deviceId, from, to);
+ if (positions != null && !positions.isEmpty()) {
+ result.setDeviceName(Context.getDeviceManager().getDeviceById(deviceId).getName());
+ Position previousPosition = null;
+ double speedSum = 0;
+ for (Position position : positions) {
+ if (previousPosition != null) {
+ result.addDistance(DistanceCalculator.distance(previousPosition.getLatitude(),
+ previousPosition.getLongitude(), position.getLatitude(), position.getLongitude()));
+ }
+ previousPosition = position;
+ speedSum += position.getSpeed();
+ result.setMaxSpeed(position.getSpeed());
+ }
+ result.setAverageSpeed(speedSum / positions.size());
+ }
+ return result;
+ }
+
+ public static String getJson(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
+ Date from, Date to) throws SQLException {
+ JsonObjectBuilder json = Json.createObjectBuilder();
+ for (long deviceId: ReportUtils.getReportedDevices(deviceIds, groupIds)) {
+ Context.getPermissionsManager().checkDevice(userId, deviceId);
+ json.add(String.valueOf(deviceId), JsonConverter.objectToJson(calculateGeneralResult(deviceId, from, to)));
+ }
+ return json.build().toString();
+ }
+
+ public static byte[] getCsv(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
+ Date from, Date to) throws SQLException {
+ CsvBuilder csv = new CsvBuilder();
+ for (long deviceId: ReportUtils.getReportedDevices(deviceIds, groupIds)) {
+ Context.getPermissionsManager().checkDevice(userId, deviceId);
+ csv.addHeaderLine(new GeneralResult());
+ csv.addLine(calculateGeneralResult(deviceId, from, to));
+ }
+ return csv.get();
+ }
+}