From a5c431069ca0dfe8240f0c8b43f0508189f8fc86 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Wed, 3 Aug 2016 10:05:40 +0500 Subject: - Added getGroupDevices to PermissionsManager - Implemented Route Report --- src/org/traccar/reports/Events.java | 5 ++++ src/org/traccar/reports/ReportUtils.java | 35 ++++++++++++++++++++++++++ src/org/traccar/reports/Route.java | 43 ++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 src/org/traccar/reports/Events.java create mode 100644 src/org/traccar/reports/ReportUtils.java create mode 100644 src/org/traccar/reports/Route.java (limited to 'src/org/traccar/reports') 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 getReportedDevices(Collection deviceIds, Collection groupIds) { + Collection 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 deviceIds, Collection 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 deviceIds, Collection 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(); + } + +} -- cgit v1.2.3