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

合并伍总的修改：修正逻辑相反错误、优化逻辑

Browse Source
This commit is contained in:
Yu Sun
2022-08-12 13:56:35 +08:00
parent 59f5a646c6 78ecd669b3
commit 96f2c8068b
3 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EdgeManager.php
View File

@@ -159,7 +159,7 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
], json_encode(array( ], json_encode(array(
'action' => 'result_set_node_data', 'action' => 'result_set_node_data',
'errcode' => 4002, 'errcode' => 4002,
'errmsg' => '未登记过的工序单元！' 'errmsg' => '工序单元有误，请检查是否未指定或未登记！'
))); )));
$connection -> send($response); $connection -> send($response);
} else if ($data_capture -> check_res === 'MISMATCH_TYPE') { } else if ($data_capture -> check_res === 'MISMATCH_TYPE') {

28
EdgeManager/EDataCapture/EDataCapture.php
View File

@@ -24,25 +24,21 @@ class EDataCapture {
$this -> working_subclass = $this -> post -> param -> working_subclass; $this -> working_subclass = $this -> post -> param -> working_subclass;
} }
}else{ }else{
//根据code查询working_subclasses if ($this -> no_dup_code) {
$this -> check_res = 'WRONG_WORKING_SUBCLASS';
return;
}
$working_subclass = ENodeConfigure::get_working_subclasses_by_codes($this -> dbconn, $this -> post -> param -> data[0] -> code); $working_subclass = ENodeConfigure::get_working_subclasses_by_codes($this -> dbconn, $this -> post -> param -> data[0] -> code);
$this -> working_subclass = $working_subclass[0]; $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'];

8
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
)); ));
} }
@@ -132,7 +132,7 @@ class ENodeConfigure {
WHERE code = '%s'", WHERE code = '%s'",
$code $code
)); ));
return pg_fetch_all_columns($res, 0); return pg_fetch_assoc($res);
} }
function get_codes_by_working_subclasses() { function get_codes_by_working_subclasses() {