From e5b44532710862eb404563c4e83d104be4b2680b Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 7 Dec 2015 10:31:56 +1300
Subject: Implement command REST resource

---
 src/org/traccar/api/resource/CommandResource.java | 49 +++++++++++++++++++++++
 src/org/traccar/web/WebServer.java                |  3 +-
 web/app/view/CommandDialogController.js           |  6 ++-
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 src/org/traccar/api/resource/CommandResource.java

diff --git a/src/org/traccar/api/resource/CommandResource.java b/src/org/traccar/api/resource/CommandResource.java
new file mode 100644
index 000000000..9029d9213
--- /dev/null
+++ b/src/org/traccar/api/resource/CommandResource.java
@@ -0,0 +1,49 @@
+/*
+ * 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 org.traccar.model.Device;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.sql.SQLException;
+import java.util.Collection;
+
+@Path("commands")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class CommandResource extends BaseResource {
+
+    @POST
+    public Response add(Command entity) {
+        Context.getConnectionManager().getActiveDevice(entity.getDeviceId()).sendCommand(entity);
+        return Response.ok(entity).build();
+    }
+
+}
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 4e451af6e..c9bee7479 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -36,6 +36,7 @@ import org.traccar.Config;
 import org.traccar.api.CorsResponseFilter;
 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.PositionResource;
 import org.traccar.api.resource.ServerResource;
@@ -127,7 +128,7 @@ public class WebServer {
             resourceConfig.register(ResourceErrorHandler.class);
             resourceConfig.register(SecurityRequestFilter.class);
             resourceConfig.register(CorsResponseFilter.class);
-            resourceConfig.registerClasses(ServerResource.class, SessionResource.class,
+            resourceConfig.registerClasses(ServerResource.class, SessionResource.class, CommandResource.class,
                     DeviceResource.class, UserResource.class, PositionResource.class);
             servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/rest/*");
         }
diff --git a/web/app/view/CommandDialogController.js b/web/app/view/CommandDialogController.js
index 94df2ec42..bf2fe4fde 100644
--- a/web/app/view/CommandDialogController.js
+++ b/web/app/view/CommandDialogController.js
@@ -42,16 +42,18 @@ Ext.define('Traccar.view.CommandDialogController', {
 
         Ext.Ajax.request({
             scope: this,
-            url: '/api/command/send',
+            url: '/api/rest/commands',
             jsonData: record.getData(),
             callback: this.onSendResult
         });
     },
 
     onSendResult: function (options, success, response) {
-        if (Traccar.ErrorManager.check(success, response)) {
+        if (success) {
             Ext.toast(Strings.commandSent);
             this.closeView();
+        } else {
+            Traccar.app.showError(response);
         }
     }
 });
-- 
cgit v1.2.3