From 7c96911d3770eafe4625b27acd732b10d717b9d0 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 4 Aug 2016 13:32:12 +0500 Subject: General report implementation --- src/org/traccar/api/resource/ReportResource.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/org/traccar/api') diff --git a/src/org/traccar/api/resource/ReportResource.java b/src/org/traccar/api/resource/ReportResource.java index cf11cd4e4..0885a3638 100644 --- a/src/org/traccar/api/resource/ReportResource.java +++ b/src/org/traccar/api/resource/ReportResource.java @@ -12,6 +12,7 @@ import javax.ws.rs.core.Response.ResponseBuilder; import org.traccar.api.BaseResource; import org.traccar.reports.Events; +import org.traccar.reports.General; import org.traccar.reports.ReportUtils; import org.traccar.reports.Route; import org.traccar.web.JsonConverter; @@ -54,4 +55,21 @@ public class ReportResource extends BaseResource { return response.build(); } + @Path("general") + @GET + public Response getGeneral( + @QueryParam("deviceId") final List deviceIds, @QueryParam("groupId") final List groupIds, + @QueryParam("from") String from, @QueryParam("to") String to) throws SQLException { + if (getAcceptHeader().equals("application/ms-excel")) { + ResponseBuilder response = Response.ok(ReportUtils.getOut(General.getCsv(getUserId(), deviceIds, groupIds, + JsonConverter.parseDate(from), JsonConverter.parseDate(to)))); + response.type("application/ms-excel"); + return response.build(); + } + ResponseBuilder response = Response.ok(General.getJson(getUserId(), deviceIds, groupIds, + JsonConverter.parseDate(from), JsonConverter.parseDate(to))); + response.type(MediaType.APPLICATION_JSON); + return response.build(); + } + } -- cgit v1.2.3