wyw/EdgeManager
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

finish API for add/remove/get device

Browse Source
This commit is contained in:
Yu Sun
2022-08-12 21:04:18 +08:00
parent 96f2c8068b
commit d43d2eedb2
3 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -21,4 +21,4 @@ yarn-error.log*
*.sw? *.sw?
/vendor /vendor
/linux_x64 /EdgeServer-net6.0-linux-x64

29
EdgeManager.php
View File

@@ -212,7 +212,7 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
$get = $request -> get(); $get = $request -> get();
if (isset($get['query'])) { if (isset($get['query'])) {
if ($get['query'] == 'nodes') { if ($get['query'] === 'nodes') {
$enode_configure = new ENodeConfigure($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get); $enode_configure = new ENodeConfigure($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get);
$nodes = $enode_configure -> get_nodes(); $nodes = $enode_configure -> get_nodes();
if (is_null($nodes)) if (is_null($nodes))
@@ -225,7 +225,7 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
'code' => 0, 'code' => 0,
'data' => $nodes 'data' => $nodes
))); )));
} else if ($get['query'] == 'working_subclasses') { } else if ($get['query'] === 'working_subclasses') {
$enode_configure = new ENodeConfigure($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get); $enode_configure = new ENodeConfigure($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get);
$working_subclasses = $enode_configure -> get_working_subclasses($dbconn); $working_subclasses = $enode_configure -> get_working_subclasses($dbconn);
if (is_null($working_subclasses)) if (is_null($working_subclasses))
@@ -238,7 +238,7 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
'code' => 0, 'code' => 0,
'data' => $working_subclasses 'data' => $working_subclasses
))); )));
} else if ($get['query'] == 'codes') { } else if ($get['query'] === 'codes') {
$enode_configure = new ENodeConfigure($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get); $enode_configure = new ENodeConfigure($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get);
$codes = $enode_configure -> get_codes_by_working_subclasses(); $codes = $enode_configure -> get_codes_by_working_subclasses();
if (is_null($codes)) if (is_null($codes))
@@ -251,7 +251,7 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
'code' => 0, 'code' => 0,
'data' => $codes 'data' => $codes
))); )));
} else if ($get['query'] == 'node_data') { } else if ($get['query'] === 'node_data') {
$data_capture = new EDataCapture($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get); $data_capture = new EDataCapture($dbconn, no_dup_code: $options['no_dup_code'] ?? true, get: $get);
$data = $data_capture -> get_node_data(); $data = $data_capture -> get_node_data();
if (is_null($data)) if (is_null($data))
@@ -269,10 +269,10 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
'code' => 0, 'code' => 0,
'data' => $data 'data' => $data
))); )));
} else if ($get['query'] == 'servers') { } else if ($get['query'] === 'servers') {
$e_configure = new EConfigure($dbconn, get: $get); $e_configure = new EConfigure($dbconn, get: $get);
$nodes = $e_configure -> get_servers(); $servers = $e_configure -> get_servers();
if (is_null($nodes)) if (is_null($servers))
$connection -> send(json_encode(array( $connection -> send(json_encode(array(
'code' => 1, 'code' => 1,
'msg' => '未添加过服务！' 'msg' => '未添加过服务！'
@@ -280,7 +280,20 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
else else
$connection -> send(json_encode(array( $connection -> send(json_encode(array(
'code' => 0, 'code' => 0,
'data' => $nodes 'data' => $servers
)));
} else if ($get['query'] === 'devices') {
$e_configure = new EConfigure($dbconn, get: $get);
$devices = $e_configure -> get_devices();
if (is_null($devices))
$connection -> send(json_encode(array(
'code' => 1,
'msg' => '未添加过设备！'
)));
else
$connection -> send(json_encode(array(
'code' => 0,
'data' => $devices
))); )));
} else { } else {
$connection -> send(json_encode(array( $connection -> send(json_encode(array(

23
EdgeManager/EController/EConfigure.php
View File

@@ -91,10 +91,29 @@ class EConfigure {
} }
function add_device() { function add_device() {
return pg_insert( $res = pg_insert(
$this -> dbconn, $this -> dbconn,
'hf_mes_scada_edgeserver_controller_server', 'hf_mes_scada_edgeserver_controller_device',
(array) $this -> post
);
return $res === false ? $res : true;
}
function remove_device() {
return pg_delete(
$this -> dbconn,
'hf_mes_scada_edgeserver_controller_device',
(array) $this -> post (array) $this -> post
); );
} }
function get_devices() {
$res = pg_query($this -> dbconn, sprintf(
"SELECT * FROM hf_mes_scada_edgeserver_controller_device
WHERE server_id = '%s'",
$this -> get['id']
));
return pg_fetch_all($res);
}
} }