aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-08-03 17:53:54 +0500
committerAbyss777 <abyss@fox5.ru>2016-08-04 16:33:34 +0500
commit504a555b40ee0c2c14e8679ed320b8c2578f8610 (patch)
treed6b0fb2fb95253afcbe7dd7fcb1cbf367b45acc6
parenta5c431069ca0dfe8240f0c8b43f0508189f8fc86 (diff)
downloadtraccar-server-504a555b40ee0c2c14e8679ed320b8c2578f8610.tar.gz
traccar-server-504a555b40ee0c2c14e8679ed320b8c2578f8610.tar.bz2
traccar-server-504a555b40ee0c2c14e8679ed320b8c2578f8610.zip
- Moved retrieving Accept to BaseResource
- Added Events report - Removed deviceIds from csv
-rw-r--r--src/org/traccar/api/BaseResource.java8
-rw-r--r--src/org/traccar/api/resource/ReportResource.java28
-rw-r--r--src/org/traccar/reports/Events.java40
-rw-r--r--src/org/traccar/reports/Route.java4
4 files changed, 70 insertions, 10 deletions
diff --git a/src/org/traccar/api/BaseResource.java b/src/org/traccar/api/BaseResource.java
index 97f5c074d..8259f8868 100644
--- a/src/org/traccar/api/BaseResource.java
+++ b/src/org/traccar/api/BaseResource.java
@@ -15,6 +15,7 @@
*/
package org.traccar.api;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.SecurityContext;
public class BaseResource {
@@ -22,6 +23,9 @@ public class BaseResource {
@javax.ws.rs.core.Context
private SecurityContext securityContext;
+ @javax.ws.rs.core.Context
+ private HttpHeaders headers;
+
protected long getUserId() {
UserPrincipal principal = (UserPrincipal) securityContext.getUserPrincipal();
if (principal != null) {
@@ -30,4 +34,8 @@ public class BaseResource {
return 0;
}
+ protected String getAcceptHeader() {
+ return headers.getRequestHeaders().getFirst("Accept");
+ }
+
}
diff --git a/src/org/traccar/api/resource/ReportResource.java b/src/org/traccar/api/resource/ReportResource.java
index 598cbebf6..cf11cd4e4 100644
--- a/src/org/traccar/api/resource/ReportResource.java
+++ b/src/org/traccar/api/resource/ReportResource.java
@@ -6,14 +6,12 @@ import java.util.List;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import org.traccar.api.BaseResource;
+import org.traccar.reports.Events;
import org.traccar.reports.ReportUtils;
import org.traccar.reports.Route;
import org.traccar.web.JsonConverter;
@@ -23,12 +21,10 @@ public class ReportResource extends BaseResource {
@Path("route")
@GET
- public Response getRoute(@Context HttpHeaders headers,
+ public Response getRoute(
@QueryParam("deviceId") final List<Long> deviceIds, @QueryParam("groupId") final List<Long> groupIds,
@QueryParam("from") String from, @QueryParam("to") String to) throws SQLException {
- MultivaluedMap<String, String> headerParams = headers.getRequestHeaders();
- String accept = headerParams.getFirst("Accept");
- if (accept.equals("application/ms-excel")) {
+ if (getAcceptHeader().equals("application/ms-excel")) {
ResponseBuilder response = Response.ok(ReportUtils.getOut(Route.getCsv(getUserId(), deviceIds, groupIds,
JsonConverter.parseDate(from), JsonConverter.parseDate(to))));
response.type("application/ms-excel");
@@ -40,4 +36,22 @@ public class ReportResource extends BaseResource {
return response.build();
}
+ @Path("events")
+ @GET
+ public Response getEvents(
+ @QueryParam("deviceId") final List<Long> deviceIds, @QueryParam("groupId") final List<Long> groupIds,
+ @QueryParam("type") final List<String> types,
+ @QueryParam("from") String from, @QueryParam("to") String to) throws SQLException {
+ if (getAcceptHeader().equals("application/ms-excel")) {
+ ResponseBuilder response = Response.ok(ReportUtils.getOut(Events.getCsv(getUserId(), deviceIds, groupIds,
+ types, JsonConverter.parseDate(from), JsonConverter.parseDate(to))));
+ response.type("application/ms-excel");
+ return response.build();
+ }
+ ResponseBuilder response = Response.ok(Events.getJson(getUserId(), deviceIds, groupIds, types,
+ JsonConverter.parseDate(from), JsonConverter.parseDate(to)));
+ response.type(MediaType.APPLICATION_JSON);
+ return response.build();
+ }
+
}
diff --git a/src/org/traccar/reports/Events.java b/src/org/traccar/reports/Events.java
index 1edeb0773..d3457e5a5 100644
--- a/src/org/traccar/reports/Events.java
+++ b/src/org/traccar/reports/Events.java
@@ -1,5 +1,45 @@
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.Event;
+import org.traccar.web.CsvBuilder;
+import org.traccar.web.JsonConverter;
+
public final class Events {
+ private 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();
+ for (long deviceId: ReportUtils.getReportedDevices(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)));
+ }
+ }
+ return json.build().toString();
+ }
+
+ public static byte[] getCsv(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
+ Collection<String> types, Date from, Date to) throws SQLException {
+ CsvBuilder csv = new CsvBuilder();
+ csv.addHeaderLine(new Event());
+ for (long deviceId: ReportUtils.getReportedDevices(deviceIds, groupIds)) {
+ Context.getPermissionsManager().checkDevice(userId, deviceId);
+ for (String type : types) {
+ csv.addArray(Context.getDataManager().getEvents(deviceId, type, from, to));
+ }
+ }
+ return csv.get();
+ }
}
diff --git a/src/org/traccar/reports/Route.java b/src/org/traccar/reports/Route.java
index 3602c4758..035526970 100644
--- a/src/org/traccar/reports/Route.java
+++ b/src/org/traccar/reports/Route.java
@@ -31,13 +31,11 @@ public final class Route {
public static byte[] getCsv(long userId, Collection<Long> deviceIds, Collection<Long> groupIds,
Date from, Date to) throws SQLException {
CsvBuilder csv = new CsvBuilder();
+ csv.addHeaderLine(new Position());
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();
}
-
}