aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorHans van den Elsen <hans.elsen@esds.nl>2016-02-09 15:46:11 +0100
committerHans van den Elsen <hans.elsen@esds.nl>2016-02-09 15:46:11 +0100
commit7883c78aef55c73cbfb4213f7720f3e450f89c75 (patch)
tree64b6bd000bfd84c697cab5e8d5d54ac7873b6c74 /src/org
parenta8c6a98f80858f2e04753086c1877c75f5abcf80 (diff)
downloadtraccar-server-7883c78aef55c73cbfb4213f7720f3e450f89c75.tar.gz
traccar-server-7883c78aef55c73cbfb4213f7720f3e450f89c75.tar.bz2
traccar-server-7883c78aef55c73cbfb4213f7720f3e450f89c75.zip
Added API endpoint for our raw commands
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/api/resource/SOSResource.java40
-rw-r--r--src/org/traccar/protocol/MiniFinderProtocol.java2
-rw-r--r--src/org/traccar/web/WebServer.java11
3 files changed, 45 insertions, 8 deletions
diff --git a/src/org/traccar/api/resource/SOSResource.java b/src/org/traccar/api/resource/SOSResource.java
new file mode 100644
index 000000000..9c25132ee
--- /dev/null
+++ b/src/org/traccar/api/resource/SOSResource.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 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.database.ActiveDevice;
+import org.traccar.model.Command;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("sos")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class SOSResource extends BaseResource {
+
+ @POST
+ public Response add(Command entity) {
+ Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
+ ActiveDevice device = Context.getConnectionManager().getActiveDevice(entity.getDeviceId());
+ device.write(entity.getType());
+ return Response.ok(entity).build();
+ }
+
+}
diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java
index cd159c8b7..33cd054f1 100644
--- a/src/org/traccar/protocol/MiniFinderProtocol.java
+++ b/src/org/traccar/protocol/MiniFinderProtocol.java
@@ -18,6 +18,7 @@ package org.traccar.protocol;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
import org.traccar.BaseProtocol;
import org.traccar.CharacterDelimiterFrameDecoder;
import org.traccar.TrackerServer;
@@ -38,6 +39,7 @@ public class MiniFinderProtocol extends BaseProtocol {
pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, ';'));
pipeline.addLast("stringDecoder", new StringDecoder());
pipeline.addLast("objectDecoder", new MiniFinderProtocolDecoder(MiniFinderProtocol.this));
+ pipeline.addLast("stringEncoder", new StringEncoder());
}
});
}
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index d6cd19d87..f18e80182 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -40,13 +40,7 @@ import org.traccar.api.CorsResponseFilter;
import org.traccar.api.ObjectMapperProvider;
import org.traccar.api.ResourceErrorHandler;
import org.traccar.api.SecurityRequestFilter;
-import org.traccar.api.resource.CommandResource;
-import org.traccar.api.resource.DeviceResource;
-import org.traccar.api.resource.PermissionResource;
-import org.traccar.api.resource.PositionResource;
-import org.traccar.api.resource.ServerResource;
-import org.traccar.api.resource.SessionResource;
-import org.traccar.api.resource.UserResource;
+import org.traccar.api.resource.*;
import org.traccar.helper.Log;
public class WebServer {
@@ -140,7 +134,8 @@ public class WebServer {
resourceConfig.register(SecurityRequestFilter.class);
resourceConfig.register(CorsResponseFilter.class);
resourceConfig.registerClasses(ServerResource.class, SessionResource.class, CommandResource.class,
- PermissionResource.class, DeviceResource.class, UserResource.class, PositionResource.class);
+ PermissionResource.class, DeviceResource.class, UserResource.class, PositionResource.class,
+ /*sos*/SOSResource.class);
servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/*");
handlers.addHandler(servletHandler);