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

修正手误导致需要自动绑定connector对象的问题

Browse Source
This commit is contained in:
Yu Sun
2022-07-16 14:16:05 +08:00
parent e68a2f433e
commit 19b3b3bd3e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
EdgeManager/EDataCapture/ENodeConfigure.php
View File

@@ -9,7 +9,7 @@ class ENodeConfigure {
) {} ) {}
function add_node() { function add_node() {
$exists = pg_query(sprintf( $exists = pg_query($this -> dbconn, sprintf(
"SELECT EXISTS( "SELECT EXISTS(
SELECT 1 FROM hf_mes_scada_data_capture_node_configure WHERE code='%s' SELECT 1 FROM hf_mes_scada_data_capture_node_configure WHERE code='%s'
)", $this -> post -> code )", $this -> post -> code
@@ -39,7 +39,7 @@ class ENodeConfigure {
(array) $this -> post (array) $this -> post
); );
// 检查一下，如果超表已经有了就不要尝试重复创建了 // 检查一下，如果超表已经有了就不要尝试重复创建了
$table_exists = pg_query(sprintf( $table_exists = pg_query($this -> dbconn, sprintf(
"SELECT * "SELECT *
FROM timescaledb_information.hypertables FROM timescaledb_information.hypertables
WHERE hypertable_name = '%s' WHERE hypertable_name = '%s'
@@ -70,13 +70,13 @@ class ENodeConfigure {
'hf_mes_scada_data_capture_node_configure', 'hf_mes_scada_data_capture_node_configure',
(array) $this -> post, (array) $this -> post,
); );
$exists = pg_query(sprintf( $exists = pg_query($this -> dbconn, sprintf(
"SELECT EXISTS( "SELECT EXISTS(
SELECT 1 FROM hf_mes_scada_data_capture_node_configure WHERE working_subclass = '%s' SELECT 1 FROM hf_mes_scada_data_capture_node_configure WHERE working_subclass = '%s'
)", $this -> post -> working_subclass )", $this -> post -> working_subclass
)); ));
if (pg_fetch_assoc($exists)['exists'] == 'f') { if (pg_fetch_assoc($exists)['exists'] == 'f') {
$res[] = pg_query(sprintf( $res[] = pg_query($this -> dbconn, sprintf(
'DROP TABLE "hf_mes_scada_data_capture_node_data_%s"', 'DROP TABLE "hf_mes_scada_data_capture_node_data_%s"',
$this -> post -> working_subclass $this -> post -> working_subclass
)); ));

6
EdgeManager/Init.php
View File

@@ -1,14 +1,14 @@
<?php <?php
function init_db($server_name, $user, $password) { function init_db($server_name, $user, $password) {
$dbconn = pg_connect(sprintf("host=%s user=%s password=%s", $server_name, $user, $password)); $dbconn = pg_connect(sprintf("host=%s user=%s password=%s", $server_name, $user, $password));
$res = pg_query("select datname from pg_database"); $res = pg_query($dbconn, "select datname from pg_database");
if (!in_array('scada', pg_fetch_all_columns($res, 0))) if (!in_array('scada', pg_fetch_all_columns($res, 0)))
pg_query("CREATE DATABASE scada"); pg_query($dbconn, "CREATE DATABASE scada");
pg_close($dbconn); pg_close($dbconn);
$dbconn = pg_connect(sprintf("host=%s dbname=scada user=%s password=%s", $server_name, $user, $password)); $dbconn = pg_connect(sprintf("host=%s dbname=scada user=%s password=%s", $server_name, $user, $password));
pg_query("CREATE TABLE IF NOT EXISTS hf_mes_scada_data_capture_node_configure ( pg_query($dbconn, "CREATE TABLE IF NOT EXISTS hf_mes_scada_data_capture_node_configure (
id serial2, id serial2,
code text primary key NOT NULL, code text primary key NOT NULL,
name text NOT NULL, name text NOT NULL,