aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/reports
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-08-03 10:05:40 +0500
committerAbyss777 <abyss@fox5.ru>2016-08-04 16:33:34 +0500
commita5c431069ca0dfe8240f0c8b43f0508189f8fc86 (patch)
treed3de1b83fbb8ec487a1e6cbef5cb13f2941c2868 /src/org/traccar/reports
parent41668cae9763a523c775a8a998620fe286176c9e (diff)
downloadtraccar-server-a5c431069ca0dfe8240f0c8b43f0508189f8fc86.tar.gz
traccar-server-a5c431069ca0dfe8240f0c8b43f0508189f8fc86.tar.bz2
traccar-server-a5c431069ca0dfe8240f0c8b43f0508189f8fc86.zip
- Added getGroupDevices to PermissionsManager
- Implemented Route Report
Diffstat (limited to 'src/org/traccar/reports')
-rw-r--r--src/org/traccar/reports/Events.java5
-rw-r--r--src/org/traccar/reports/ReportUtils.java35
-rw-r--r--src/org/traccar/reports/Route.java43
3 files changed, 83 insertions, 0 deletions
diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java
new file mode 100644
index 000000000..1edeb0773
--- /dev/null
+++ b/src/org/traccar/reports/Events.java
@@ -0,0 +1,5 @@
+package org.traccar.reports;
+
+public final class Events {
+
+}
diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java
new file mode 100644
index 000000000..e8048f1f2
--- /dev/null
+++ b/src/org/traccar/reports/ReportUtils.java
@@ -0,0 +1,35 @@
+package org.traccar.reports;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.StreamingOutput;
+
+import org.traccar.Context;
+
+public final class ReportUtils {
+
+ private ReportUtils() {
+ }
+
+ public static Collection<Long> getReportedDevices(Collection<Long> deviceIds, Collection<Long> groupIds) {
+ Collection<Long> result = new ArrayList<>();
+ result.addAll(deviceIds);
+ for (long groupId : groupIds) {
+ result.addAll(Context.getPermissionsManager().getGroupDevices(groupId));
+ }
+ return result;
+ }
+
+ public static StreamingOutput getOut(final byte[] csvBytes) {
+ return new StreamingOutput() {
+ @Override
+ public void write(OutputStream out) throws IOException, WebApplicationException {
+ out.write(csvBytes);
+ }
+ };
+ }
+}
diff --git a/src/org/traccar/reports/Route.java b/src/org/traccar/reports/Route.java
new file mode 100644
index 000000000..3602c4758
--- /dev/null
+++ b/src/org/traccar/reports/Route.java
@@ -0,0 +1,43 @@
+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.model.Position;
+import org.traccar.web.CsvBuilder;
+import org.traccar.web.JsonConverter;
+
+public final class Route {
+
+ private Route() {
+ }
+
+ 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.arrayToJson(Context.getDataManager()
+ .getPositions(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.addLine(deviceId);
+ csv.addHeaderLine(new Position());
+ csv.addArray(Context.getDataManager().getPositions(deviceId, from, to));
+ }
+ return csv.get();
+ }
+
+}