From 4109447d0adc778b246543b77672c280d58da8bf Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Sat, 18 Jun 2016 07:59:43 +0500 Subject: - Update Geofences API and Manager a bit - Show geofence name in event toasts - Link/Unlink geofences to users, devices and groups --- src/org/traccar/api/resource/GeofenceResource.java | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'src/org/traccar/api/resource') diff --git a/src/org/traccar/api/resource/GeofenceResource.java b/src/org/traccar/api/resource/GeofenceResource.java index 9c80e61a1..e94e3fedb 100644 --- a/src/org/traccar/api/resource/GeofenceResource.java +++ b/src/org/traccar/api/resource/GeofenceResource.java @@ -17,6 +17,7 @@ package org.traccar.api.resource; import org.traccar.Context; import org.traccar.api.BaseResource; +import org.traccar.database.GeofenceManager; import org.traccar.model.Geofence; import javax.ws.rs.Consumes; @@ -33,6 +34,8 @@ import javax.ws.rs.core.Response; import java.sql.SQLException; import java.util.Collection; +import java.util.HashSet; +import java.util.Set; @Path("geofences") @Produces(MediaType.APPLICATION_JSON) @@ -41,17 +44,33 @@ public class GeofenceResource extends BaseResource { @GET public Collection get( - @QueryParam("all") boolean all, @QueryParam("userId") long userId) throws SQLException { + @QueryParam("all") boolean all, @QueryParam("userId") long userId, @QueryParam("groupId") long groupId, + @QueryParam("deviceId") long deviceId) throws SQLException { + + GeofenceManager geofenceManager = Context.getGeofenceManager(); + Set result; if (all) { Context.getPermissionsManager().checkAdmin(getUserId()); - return Context.getGeofenceManager().getAllGeofences(); + result = new HashSet<>(geofenceManager.getAllGeofencesIds()); } else { if (userId == 0) { userId = getUserId(); } Context.getPermissionsManager().checkUser(getUserId(), userId); - return Context.getGeofenceManager().getUserGeofences(userId); + result = new HashSet(geofenceManager.getUserGeofencesIds(userId)); + } + + if (groupId != 0) { + Context.getPermissionsManager().checkGroup(getUserId(), groupId); + result.retainAll(geofenceManager.getGroupGeofencesIds(groupId)); } + + if (deviceId != 0) { + Context.getPermissionsManager().checkDevice(getUserId(), deviceId); + result.retainAll(geofenceManager.getDeviceGeofencesIds(deviceId)); + } + return Context.getGeofenceManager().getGeofences(result); + } @POST -- cgit v1.2.3 From 66a21745d90fe1068f3415e705dff3736c19eaaa Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Sat, 18 Jun 2016 08:11:13 +0500 Subject: Variable --- src/org/traccar/api/resource/GeofenceResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org/traccar/api/resource') diff --git a/src/org/traccar/api/resource/GeofenceResource.java b/src/org/traccar/api/resource/GeofenceResource.java index e94e3fedb..44f6fc2f5 100644 --- a/src/org/traccar/api/resource/GeofenceResource.java +++ b/src/org/traccar/api/resource/GeofenceResource.java @@ -69,7 +69,7 @@ public class GeofenceResource extends BaseResource { Context.getPermissionsManager().checkDevice(getUserId(), deviceId); result.retainAll(geofenceManager.getDeviceGeofencesIds(deviceId)); } - return Context.getGeofenceManager().getGeofences(result); + return geofenceManager.getGeofences(result); } -- cgit v1.2.3