aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api/resource/CommandResource.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-09-20 13:26:21 +0500
committerAbyss777 <abyss@fox5.ru>2017-09-20 13:26:21 +0500
commit9daa51652f28066534d42046961990e15b490562 (patch)
treeebdbf307e4a01190f4244b1806ce2a8b512362cd /src/org/traccar/api/resource/CommandResource.java
parent849878cf105baed2348c605f7232012efb294480 (diff)
downloadtrackermap-server-9daa51652f28066534d42046961990e15b490562.tar.gz
trackermap-server-9daa51652f28066534d42046961990e15b490562.tar.bz2
trackermap-server-9daa51652f28066534d42046961990e15b490562.zip
Move Commandtypes API to Commands
Diffstat (limited to 'src/org/traccar/api/resource/CommandResource.java')
-rw-r--r--src/org/traccar/api/resource/CommandResource.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/org/traccar/api/resource/CommandResource.java b/src/org/traccar/api/resource/CommandResource.java
index 6a258497f..7300840f0 100644
--- a/src/org/traccar/api/resource/CommandResource.java
+++ b/src/org/traccar/api/resource/CommandResource.java
@@ -19,6 +19,7 @@ import org.traccar.Context;
import org.traccar.api.ExtendedObjectResource;
import org.traccar.database.CommandsManager;
import org.traccar.model.Command;
+import org.traccar.model.Typed;
import java.sql.SQLException;
import java.util.Collection;
@@ -72,4 +73,15 @@ public class CommandResource extends ExtendedObjectResource<Command> {
return Response.ok(entity).build();
}
+ @GET
+ @Path("types")
+ public Collection<Typed> get(@QueryParam("deviceId") long deviceId,
+ @QueryParam("textChannel") boolean textChannel) {
+ if (deviceId != 0) {
+ Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
+ return Context.getCommandsManager().getCommandTypes(deviceId, textChannel);
+ } else {
+ return Context.getCommandsManager().getAllCommandTypes();
+ }
+ }
}