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

修复no_dup_code参数判断的代码逻辑处理

Browse Source
This commit is contained in:
wuyanwei
2022-08-12 13:02:54 +08:00
parent a5acd554ab
commit 78ecd669b3
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
EdgeManager/EDataCapture/EDataCapture.php
View File

@@ -32,20 +32,13 @@ class EDataCapture {
$this -> working_subclass = $working_subclass['working_subclass']; $this -> working_subclass = $working_subclass['working_subclass'];
} }
if ($this -> no_dup_code) { $res = pg_fetch_all(pg_query($this -> dbconn, sprintf(
$res = pg_fetch_all(pg_query($this -> dbconn, "SELECT code, type
"SELECT code, type FROM hf_mes_scada_data_capture_node_configure
FROM hf_mes_scada_data_capture_node_configure" WHERE working_subclass = '%s'",
)); $this -> working_subclass
} else { )));
$res = pg_fetch_all(pg_query($this -> dbconn, sprintf(
"SELECT code, type
FROM hf_mes_scada_data_capture_node_configure
WHERE working_subclass = '%s'",
$this -> working_subclass
)));
}
$code_type = &$this -> code_type; $code_type = &$this -> code_type;
array_walk($res, function(&$v, $k) use (&$code_type) { array_walk($res, function(&$v, $k) use (&$code_type) {
$code_type[$v['code']] = $v['type']; $code_type[$v['code']] = $v['type'];

6
EdgeManager/EDataCapture/ENodeConfigure.php
View File

@@ -16,15 +16,15 @@ class ENodeConfigure {
"SELECT EXISTS( "SELECT EXISTS(
SELECT 1 FROM hf_mes_scada_data_capture_node_configure SELECT 1 FROM hf_mes_scada_data_capture_node_configure
WHERE code = '%s' WHERE code = '%s'
)", $this -> post -> code AND working_subclass = '%s'
)", $this -> post -> code, $this -> post -> working_subclass
)); ));
} else { } else {
$exists = pg_query($this -> dbconn, sprintf( $exists = pg_query($this -> dbconn, sprintf(
"SELECT EXISTS( "SELECT EXISTS(
SELECT 1 FROM hf_mes_scada_data_capture_node_configure SELECT 1 FROM hf_mes_scada_data_capture_node_configure
WHERE code = '%s' WHERE code = '%s'
AND working_subclass = '%s' )", $this -> post -> code
)", $this -> post -> code, $this -> post -> working_subclass
)); ));
} }