aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/reports/Events.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-08-08 18:05:07 +0500
committerAbyss777 <abyss@fox5.ru>2016-08-08 18:05:07 +0500
commit7a6de316942316466622f9bfa64691c4ba433b88 (patch)
tree885d8471977bfe8a650fcbbabea18591eab71d6b /src/org/traccar/reports/Events.java
parent988ee3cc1067ef3cd63c5f5f4b4363fd9b048c84 (diff)
downloadtrackermap-server-7a6de316942316466622f9bfa64691c4ba433b88.tar.gz
trackermap-server-7a6de316942316466622f9bfa64691c4ba433b88.tar.bz2
trackermap-server-7a6de316942316466622f9bfa64691c4ba433b88.zip
- Added deviceId in SummaryReport
- Response bare array for application/json - Migrate to /api/reports/route in web-interface
Diffstat (limited to 'src/org/traccar/reports/Events.java')
-rw-r--r--src/org/traccar/reports/Events.java9
1 files changed, 5 insertions, 4 deletions
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();