diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-10-20 16:46:17 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-20 16:46:17 +1300 |
commit | 504969d034dce57ebdc85800e051ee918024ef7f (patch) | |
tree | af3f19ac3bfd02274cc34de3fbb296302cd8631a /src/org/traccar/api/resource/EventResource.java | |
parent | f64840b9e85d4869c92e9f20a2f5043522ad4008 (diff) | |
parent | 45302036168fe3adf1d9d184cd68e92e15dd3b1f (diff) | |
download | trackermap-server-504969d034dce57ebdc85800e051ee918024ef7f.tar.gz trackermap-server-504969d034dce57ebdc85800e051ee918024ef7f.tar.bz2 trackermap-server-504969d034dce57ebdc85800e051ee918024ef7f.zip |
Merge pull request #2448 from Abyss777/export_excel
Implement export reports to excel
Diffstat (limited to 'src/org/traccar/api/resource/EventResource.java')
-rw-r--r-- | src/org/traccar/api/resource/EventResource.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/org/traccar/api/resource/EventResource.java b/src/org/traccar/api/resource/EventResource.java index 74a748ea5..c0a8f968d 100644 --- a/src/org/traccar/api/resource/EventResource.java +++ b/src/org/traccar/api/resource/EventResource.java @@ -1,14 +1,12 @@ package org.traccar.api.resource; import java.sql.SQLException; -import java.util.Collection; import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import org.traccar.Context; @@ -26,14 +24,9 @@ public class EventResource extends BaseResource { public Event get(@PathParam("id") long id) throws SQLException { Event event = Context.getDataManager().getEvent(id); Context.getPermissionsManager().checkDevice(getUserId(), event.getDeviceId()); + if (event.getGeofenceId() != 0) { + Context.getPermissionsManager().checkGeofence(getUserId(), event.getGeofenceId()); + } return event; } - - @GET - public Collection<Event> get( - @QueryParam("deviceId") long deviceId, @QueryParam("type") String type, - @QueryParam("interval") int interval) throws SQLException { - Context.getPermissionsManager().checkDevice(getUserId(), deviceId); - return Context.getDataManager().getLastEvents(deviceId, type, interval); - } } |