- Used @Consumes and @Produces instead of direct header access

- Renamed General to Summary
- Other changes

1 files changed, 66 insertions, 0 deletions

diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java
new file mode 100644
index 000000000..474562002
--- /dev/null
+++ b/src/org/traccar/reports/Summary.java
@@ -0,0 +1,66 @@
+package org.traccar.reports;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+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.reports.model.SummaryReport;
+import org.traccar.web.CsvBuilder;
+import org.traccar.web.JsonConverter;
+
+public final class Summary {
+
+    private Summary() {
+    }
+
+    private static SummaryReport calculateGeneralResult(long deviceId, Date from, Date to) throws SQLException {
+        SummaryReport result = new SummaryReport();
+        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());
+            result.setDistance(new BigDecimal(result.getDistance()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+        }
+        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.getDeviceList(deviceIds, groupIds)) {
+            Context.getPermissionsManager().checkDevice(userId, deviceId);
+            json.add(String.valueOf(deviceId), JsonConverter.objectToJson(calculateGeneralResult(deviceId, from, to)));
+        }
+        return json.build().toString();
+    }
+
+    public static String getCsv(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
+            Date from, Date to) throws SQLException {
+        CsvBuilder csv = new CsvBuilder();
+        csv.addHeaderLine(new SummaryReport());
+        for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
+            Context.getPermissionsManager().checkDevice(userId, deviceId);
+            csv.addLine(calculateGeneralResult(deviceId, from, to));
+        }
+        return csv.build();
+    }
+}