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

Merge branch 'master' of ssh://118.195.187.246:10022/ysun/EdgeManager

Browse Source
This commit is contained in:
Yu Sun
2022-08-11 16:04:41 +08:00
parent fd7e58c02c 47004e2377
commit d4385e6471
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
EdgeManager/EDataCapture/EDataCapture.php
View File

@@ -13,14 +13,20 @@ class EDataCapture {
protected $data = [], protected $data = [],
) { ) {
if (!is_null($this -> post)) { if (!is_null($this -> post)) {
if (!in_array( if(isset($this -> post -> param -> working_subclass)){
$this -> post -> param -> working_subclass, if (!in_array(
ENodeConfigure::get_working_subclasses($this -> dbconn) $this -> post -> param -> working_subclass,
)) { ENodeConfigure::get_working_subclasses($this -> dbconn)
$this -> check_res = 'WRONG_WORKING_SUBCLASS'; )) {
return; $this -> check_res = 'WRONG_WORKING_SUBCLASS';
} else { return;
$this -> working_subclass = $this -> post -> param -> working_subclass; } else {
$this -> working_subclass = $this -> post -> param -> working_subclass;
}
}else{
//根据code查询working_subclasses
$working_subclass = ENodeConfigure::get_working_subclasses_by_codes($this -> dbconn, $this -> post -> param -> data[0] -> code);
$this -> working_subclass = $working_subclass[0];
} }
if ($this -> no_dup_code) { if ($this -> no_dup_code) {
@@ -33,7 +39,7 @@ class EDataCapture {
"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'", WHERE working_subclass = '%s'",
$this -> post -> param -> working_subclass $this -> working_subclass
))); )));
} }

10
EdgeManager/EDataCapture/ENodeConfigure.php
View File

@@ -125,6 +125,16 @@ class ENodeConfigure {
return pg_fetch_all_columns($res, 0); return pg_fetch_all_columns($res, 0);
} }
static function get_working_subclasses_by_codes($dbconn, $code) {
$res = pg_query($dbconn, sprintf(
"SELECT working_subclass
FROM hf_mes_scada_data_capture_node_configure
WHERE code = '%s'",
$code
));
return pg_fetch_all_columns($res, 0);
}
function get_codes_by_working_subclasses() { function get_codes_by_working_subclasses() {
$res = pg_query($this -> dbconn, sprintf( $res = pg_query($this -> dbconn, sprintf(
"SELECT code "SELECT code