add: rename controller command
This commit is contained in:
parent
08699c8817
commit
2be5532778
3 changed files with 11 additions and 4 deletions
|
|
@ -1,5 +1,6 @@
|
|||
#include <netdb.h>
|
||||
#include <models/controller_dbo.h>
|
||||
#include <config.h>
|
||||
#include "api_v1_controllers.h"
|
||||
using namespace api::v1;
|
||||
|
||||
|
|
@ -86,6 +87,7 @@ controllers::put_one_by_id(const HttpRequestPtr &req, std::function<void(const H
|
|||
auto resp = HttpResponse::newHttpResponse();
|
||||
if(controllers[0]->update())
|
||||
{
|
||||
controllers[0]->command(config::command_code_set_name, controllers[0]->name);
|
||||
resp = HttpResponse::newHttpJsonResponse(controllers[0]->to_json());
|
||||
}
|
||||
else
|
||||
|
|
|
|||
117
controllers/api_v1_controllers_relays.cc
Normal file
117
controllers/api_v1_controllers_relays.cc
Normal file
|
|
@ -0,0 +1,117 @@
|
|||
#include <netdb.h>
|
||||
#include <models/relay_dbo.h>
|
||||
#include <helpers.h>
|
||||
#include <models/controller_dbo.h>
|
||||
#include <models/schedule_dbo.h>
|
||||
#include <config.h>
|
||||
#include "api_v1_controllers.h"
|
||||
|
||||
using namespace api::v1;
|
||||
|
||||
void
|
||||
controllers::get_relays_all(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback,
|
||||
const std::string& controller_id)
|
||||
{
|
||||
relay_dbo **all_controller_relays = relay_dbo::get_by_simple("controller_id", (void *) controller_id.c_str(), (intptr_t) sqlite3_bind_text);
|
||||
Json::Value all_relays_json(Json::arrayValue);
|
||||
|
||||
for(int i = 0; all_controller_relays[i] != nullptr; i++)
|
||||
{
|
||||
all_relays_json.append(all_controller_relays[i]->to_json());
|
||||
}
|
||||
|
||||
auto resp = HttpResponse::newHttpJsonResponse(all_relays_json);
|
||||
|
||||
callback(resp);
|
||||
|
||||
relay_dbo::free_list(all_controller_relays);
|
||||
}
|
||||
|
||||
void
|
||||
controllers::get_relays_one_by_id_and_num(const HttpRequestPtr &req,
|
||||
std::function<void(const HttpResponsePtr &)> &&callback, const std::string& controller_id,
|
||||
int relay_num)
|
||||
{
|
||||
relay_dbo *relay = relay_dbo::get_relay_for_controller(controller_id.c_str(), relay_num);
|
||||
|
||||
if(relay)
|
||||
{
|
||||
auto resp = HttpResponse::newHttpJsonResponse(relay->to_json());
|
||||
|
||||
callback(resp);
|
||||
|
||||
delete relay;
|
||||
}
|
||||
else
|
||||
{
|
||||
auto resp = HttpResponse::newHttpResponse();
|
||||
resp->setStatusCode(k404NotFound);
|
||||
|
||||
callback(resp);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
controllers::put_relays_one_by_id_and_num(const HttpRequestPtr &req,
|
||||
std::function<void(const HttpResponsePtr &)> &&callback, const std::string& controller_id,
|
||||
int relay_num)
|
||||
{
|
||||
if(!relay_dbo::valid_num_for_controller(controller_id.c_str(), relay_num))
|
||||
{
|
||||
auto resp = HttpResponse::newHttpResponse();
|
||||
resp->setStatusCode(k400BadRequest);
|
||||
callback(resp);
|
||||
return;
|
||||
}
|
||||
|
||||
relay_dbo *relay = relay_dbo::get_relay_for_controller(controller_id.c_str(), relay_num);
|
||||
Json::Value body = *req->getJsonObject();
|
||||
|
||||
bool db_action_result;
|
||||
|
||||
if(relay)
|
||||
{
|
||||
strncpy(relay->name, body["name"].asCString(), 127);
|
||||
strncpy(relay->active_schedule_id, body["active_schedule"].asCString(), 32);
|
||||
|
||||
db_action_result = relay->update();
|
||||
}
|
||||
else
|
||||
{
|
||||
relay = new relay_dbo();
|
||||
relay->number = relay_num;
|
||||
strncpy(relay->name, body["name"].asCString(), 127);
|
||||
strncpy(relay->active_schedule_id, body["active_schedule"].asCString(), 32);
|
||||
strncpy(relay->controller_id, controller_id.c_str(), 32);
|
||||
|
||||
db_action_result = relay->insert();
|
||||
}
|
||||
|
||||
if(!db_action_result)
|
||||
{
|
||||
auto resp = HttpResponse::newHttpResponse();
|
||||
resp->setStatusCode(k500InternalServerError);
|
||||
callback(resp);
|
||||
}
|
||||
else
|
||||
{
|
||||
auto schedules = schedule_dbo::get_by_simple("id", body["active_schedule"].asCString(), (intptr_t)&sqlite3_bind_text);
|
||||
auto controllers = controller_dbo::get_by_simple("id", controller_id.c_str(), (intptr_t)&sqlite3_bind_text);
|
||||
|
||||
Json::Value payload;
|
||||
payload["target"] = relay_num;
|
||||
payload["schedule"] = schedules[0]->to_json();
|
||||
|
||||
Json::StreamWriterBuilder json_writer;
|
||||
|
||||
controllers[0]->command(config::command_code_set_schedule, Json::writeString(json_writer, payload).c_str());
|
||||
|
||||
auto resp = HttpResponse::newHttpJsonResponse(relay->to_json());
|
||||
callback(resp);
|
||||
|
||||
schedule_dbo::free_list(schedules);
|
||||
controller_dbo::free_list(controllers);
|
||||
}
|
||||
|
||||
delete relay;
|
||||
}
|
||||
|
|
@ -10,7 +10,10 @@
|
|||
|
||||
controller_dbo::~controller_dbo()
|
||||
{
|
||||
relay_dbo::free_list(this->relays);
|
||||
if(this->relays)
|
||||
{
|
||||
relay_dbo::free_list(this->relays);
|
||||
}
|
||||
}
|
||||
|
||||
static bool controller_db_update_insert(controller_dbo *controller, sqlite3_stmt *stmt)
|
||||
|
|
@ -214,16 +217,18 @@ controller_dbo::get_by(helpers::sql_filter_builder **filters)
|
|||
bool
|
||||
controller_dbo::command(int command_code, const char *payload)
|
||||
{
|
||||
char port[6];
|
||||
sprintf(port, "%d", this->port);
|
||||
char port_str[6];
|
||||
sprintf(port_str, "%d", this->port);
|
||||
|
||||
int controller_socket = helpers::open_tcp_connection(this->ip, port);
|
||||
int controller_socket = helpers::open_tcp_connection(this->ip, port_str);
|
||||
|
||||
if(!controller_socket)
|
||||
{
|
||||
LOG_ERROR << "Can't open command socket " << this->ip << ":" << port_str;
|
||||
return false;
|
||||
}
|
||||
|
||||
LOG_DEBUG << "Commanding (" << command_code << ") " << payload;
|
||||
send(controller_socket, &command_code, 1, 0);
|
||||
send(controller_socket, payload, strlen(payload), 0);
|
||||
close(controller_socket);
|
||||
|
|
|
|||
Loading…
Reference in a new issue