aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/resource/AttributeResource.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-07-28 10:43:21 +0500
committerAbyss777 <abyss@fox5.ru>2017-07-28 10:50:14 +0500
commit0da1f5da4e5e0e39259ab3333c1273ba5cb382a7 (patch)
tree1e3f55166e922ab43c0be495abed71e536fdc216 /src/org/traccar/api/resource/AttributeResource.java
parentd3021c9ae11b177fe05b79e98f1e560e8c3cbaf5 (diff)
downloadtrackermap-server-0da1f5da4e5e0e39259ab3333c1273ba5cb382a7.tar.gz
trackermap-server-0da1f5da4e5e0e39259ab3333c1273ba5cb382a7.tar.bz2
trackermap-server-0da1f5da4e5e0e39259ab3333c1273ba5cb382a7.zip
Combine some GET functions
Diffstat (limited to 'src/org/traccar/api/resource/AttributeResource.java')
-rw-r--r--src/org/traccar/api/resource/AttributeResource.java48
1 files changed, 2 insertions, 46 deletions
diff --git a/src/org/traccar/api/resource/AttributeResource.java b/src/org/traccar/api/resource/AttributeResource.java
index 55fd39fc6..26a1f6931 100644
--- a/src/org/traccar/api/resource/AttributeResource.java
+++ b/src/org/traccar/api/resource/AttributeResource.java
@@ -17,12 +17,8 @@
package org.traccar.api.resource;
import java.sql.SQLException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
@@ -31,8 +27,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.traccar.Context;
-import org.traccar.api.BaseObjectResource;
-import org.traccar.database.AttributesManager;
+import org.traccar.api.ExtendedObjectResource;
import org.traccar.model.Attribute;
import org.traccar.model.Position;
import org.traccar.processing.ComputedAttributesHandler;
@@ -40,51 +35,12 @@ import org.traccar.processing.ComputedAttributesHandler;
@Path("attributes/computed")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
-public class AttributeResource extends BaseObjectResource<Attribute> {
+public class AttributeResource extends ExtendedObjectResource<Attribute> {
public AttributeResource() {
super(Attribute.class);
}
- @GET
- public Collection<Attribute> get(
- @QueryParam("all") boolean all, @QueryParam("userId") long userId, @QueryParam("groupId") long groupId,
- @QueryParam("deviceId") long deviceId, @QueryParam("refresh") boolean refresh) throws SQLException {
-
- AttributesManager attributesManager = Context.getAttributesManager();
- if (refresh) {
- attributesManager.refreshItems();
- }
-
- Set<Long> result = new HashSet<>();
- if (all) {
- if (Context.getPermissionsManager().isAdmin(getUserId())) {
- result.addAll(attributesManager.getAllItems());
- } else {
- Context.getPermissionsManager().checkManager(getUserId());
- result.addAll(attributesManager.getManagedItems(getUserId()));
- }
- } else {
- if (userId == 0) {
- userId = getUserId();
- }
- Context.getPermissionsManager().checkUser(getUserId(), userId);
- result.addAll(attributesManager.getUserItems(userId));
- }
-
- if (groupId != 0) {
- Context.getPermissionsManager().checkGroup(getUserId(), groupId);
- result.retainAll(attributesManager.getGroupItems(groupId));
- }
-
- if (deviceId != 0) {
- Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
- result.retainAll(attributesManager.getDeviceItems(deviceId));
- }
- return attributesManager.getItems(result);
-
- }
-
@POST
@Path("test")
public Response test(@QueryParam("deviceId") long deviceId, Attribute entity) throws SQLException {