aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-10-08 18:27:33 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-10-08 18:27:33 +1300
commitccd10d6ee510c72b583fae8e302ed6c44574d5b1 (patch)
treea9427c6938552e0ba6ed53d3097902dd79cd1787 /src/org/traccar
parent3c5293cd078149a81cfdd21878e7731d56b2830c (diff)
downloadtraccar-server-ccd10d6ee510c72b583fae8e302ed6c44574d5b1.tar.gz
traccar-server-ccd10d6ee510c72b583fae8e302ed6c44574d5b1.tar.bz2
traccar-server-ccd10d6ee510c72b583fae8e302ed6c44574d5b1.zip
Implement statistics API call
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/api/resource/StatisticsResource.java43
-rw-r--r--src/org/traccar/database/DataManager.java4
-rw-r--r--src/org/traccar/web/WebServer.java4
3 files changed, 49 insertions, 2 deletions
diff --git a/src/org/traccar/api/resource/StatisticsResource.java b/src/org/traccar/api/resource/StatisticsResource.java
new file mode 100644
index 000000000..1f0d05e06
--- /dev/null
+++ b/src/org/traccar/api/resource/StatisticsResource.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.api.resource;
+
+import org.traccar.Context;
+import org.traccar.api.BaseResource;
+import org.traccar.model.Statistics;
+import org.traccar.web.JsonConverter;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import java.sql.SQLException;
+import java.util.Collection;
+
+@Path("statistics")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class StatisticsResource extends BaseResource {
+
+ @GET
+ public Collection<Statistics> get(@QueryParam("from") String from, @QueryParam("to") String to) throws SQLException {
+ Context.getPermissionsManager().checkAdmin(getUserId());
+ return Context.getDataManager().getStatistics(JsonConverter.parseDate(from), JsonConverter.parseDate(to));
+ }
+
+}
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 6718bda83..58d16d7f5 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -474,8 +474,10 @@ public class DataManager {
.executeUpdate();
}
- public Collection<Statistics> getStatistics() throws SQLException {
+ public Collection<Statistics> getStatistics(Date from, Date to) throws SQLException {
return QueryBuilder.create(dataSource, getQuery("database.selectStatistics"))
+ .setDate("from", from)
+ .setDate("to", to)
.executeQuery(Statistics.class);
}
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index ec15ea2be..ecdac73c0 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -40,6 +40,7 @@ import org.traccar.api.resource.GroupPermissionResource;
import org.traccar.api.resource.ServerResource;
import org.traccar.api.resource.SessionResource;
import org.traccar.api.resource.DevicePermissionResource;
+import org.traccar.api.resource.StatisticsResource;
import org.traccar.api.resource.UserResource;
import org.traccar.api.resource.GroupResource;
import org.traccar.api.resource.NotificationResource;
@@ -162,7 +163,8 @@ public class WebServer {
GroupResource.class, DeviceResource.class, PositionResource.class,
CommandTypeResource.class, EventResource.class, GeofenceResource.class,
DeviceGeofenceResource.class, GeofencePermissionResource.class, GroupGeofenceResource.class,
- NotificationResource.class, ReportResource.class, AttributeAliasResource.class);
+ NotificationResource.class, ReportResource.class, AttributeAliasResource.class,
+ StatisticsResource.class);
servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/*");
handlers.addHandler(servletHandler);