From 7a6de316942316466622f9bfa64691c4ba433b88 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 8 Aug 2016 18:05:07 +0500
Subject: - Added deviceId in SummaryReport

- Response bare array for application/json
- Migrate to /api/reports/route in web-interface
---
 src/org/traccar/reports/Events.java              | 9 +++++----
 src/org/traccar/reports/Route.java               | 9 +++++----
 src/org/traccar/reports/Summary.java             | 9 +++++----
 src/org/traccar/reports/model/SummaryReport.java | 8 ++++++++
 4 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'src/org/traccar')

diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java
index 9e14bd3db..fbbd3131b 100644
--- a/src/org/traccar/reports/Events.java
+++ b/src/org/traccar/reports/Events.java
@@ -5,7 +5,7 @@ import java.util.Collection;
 import java.util.Date;
 
 import javax.json.Json;
-import javax.json.JsonObjectBuilder;
+import javax.json.JsonArrayBuilder;
 
 import org.traccar.Context;
 import org.traccar.model.Event;
@@ -19,12 +19,13 @@ public final class Events {
 
     public static String getJson(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
             Collection<String> types, Date from, Date to) throws SQLException {
-        JsonObjectBuilder json = Json.createObjectBuilder();
+        JsonArrayBuilder json = Json.createArrayBuilder();
         for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
             Context.getPermissionsManager().checkDevice(userId, deviceId);
             for (String type : types) {
-                json.add(String.valueOf(deviceId), JsonConverter.arrayToJson(Context.getDataManager()
-                        .getEvents(deviceId, type, from, to)));
+                for (Event event : Context.getDataManager().getEvents(deviceId, type, from, to)) {
+                    json.add(JsonConverter.objectToJson(event));
+                }
             }
         }
         return json.build().toString();
diff --git a/src/org/traccar/reports/Route.java b/src/org/traccar/reports/Route.java
index 7abe5c194..9622151e7 100644
--- a/src/org/traccar/reports/Route.java
+++ b/src/org/traccar/reports/Route.java
@@ -5,7 +5,7 @@ import java.util.Collection;
 import java.util.Date;
 
 import javax.json.Json;
-import javax.json.JsonObjectBuilder;
+import javax.json.JsonArrayBuilder;
 
 import org.traccar.Context;
 import org.traccar.model.Position;
@@ -19,11 +19,12 @@ public final class Route {
 
     public static String getJson(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
             Date from, Date to) throws SQLException {
-        JsonObjectBuilder json = Json.createObjectBuilder();
+        JsonArrayBuilder json = Json.createArrayBuilder();
         for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
             Context.getPermissionsManager().checkDevice(userId, deviceId);
-            json.add(String.valueOf(deviceId), JsonConverter.arrayToJson(Context.getDataManager()
-                    .getPositions(deviceId, from, to)));
+            for (Position position : Context.getDataManager().getPositions(deviceId, from, to)) {
+                json.add(JsonConverter.objectToJson(position));
+            }
         }
         return json.build().toString();
     }
diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java
index 474562002..e0da1c87e 100644
--- a/src/org/traccar/reports/Summary.java
+++ b/src/org/traccar/reports/Summary.java
@@ -7,7 +7,7 @@ import java.util.Collection;
 import java.util.Date;
 
 import javax.json.Json;
-import javax.json.JsonObjectBuilder;
+import javax.json.JsonArrayBuilder;
 
 import org.traccar.Context;
 import org.traccar.helper.DistanceCalculator;
@@ -23,9 +23,10 @@ public final class Summary {
 
     private static SummaryReport calculateGeneralResult(long deviceId, Date from, Date to) throws SQLException {
         SummaryReport result = new SummaryReport();
+        result.setDeviceId(deviceId);
+        result.setDeviceName(Context.getDeviceManager().getDeviceById(deviceId).getName());
         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) {
@@ -45,10 +46,10 @@ public final class Summary {
 
     public static String getJson(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
             Date from, Date to) throws SQLException {
-        JsonObjectBuilder json = Json.createObjectBuilder();
+        JsonArrayBuilder json = Json.createArrayBuilder();
         for (long deviceId: ReportUtils.getDeviceList(deviceIds, groupIds)) {
             Context.getPermissionsManager().checkDevice(userId, deviceId);
-            json.add(String.valueOf(deviceId), JsonConverter.objectToJson(calculateGeneralResult(deviceId, from, to)));
+            json.add(JsonConverter.objectToJson(calculateGeneralResult(deviceId, from, to)));
         }
         return json.build().toString();
     }
diff --git a/src/org/traccar/reports/model/SummaryReport.java b/src/org/traccar/reports/model/SummaryReport.java
index aed3915f1..e42727eaf 100644
--- a/src/org/traccar/reports/model/SummaryReport.java
+++ b/src/org/traccar/reports/model/SummaryReport.java
@@ -2,6 +2,14 @@ package org.traccar.reports.model;
 
 public class SummaryReport {
 
+    private long deviceId;
+    public long getDeviceId() {
+        return deviceId;
+    }
+    public void setDeviceId(long deviceId) {
+        this.deviceId = deviceId;
+    }
+
     private String deviceName;
     public String getDeviceName() {
         return deviceName;
-- 
cgit v1.2.3