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

修复非no_dup_code模式下，请求不带有working_subclass，查询获取第一个结果

Browse Source
This commit is contained in:
wuyanwei
2022-08-12 12:56:30 +08:00
parent d4385e6471
commit a5acd554ab
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EdgeManager.php
View File

@@ -117,7 +117,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') {

7
EdgeManager/EDataCapture/EDataCapture.php
View File

@@ -24,9 +24,12 @@ 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) { if ($this -> no_dup_code) {

2
EdgeManager/EDataCapture/ENodeConfigure.php
View File

@@ -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() {