|
@@ -61,6 +61,7 @@ class OpcDataController extends BaseController
|
|
|
'fan_1' => 1, // 主通风
|
|
|
'nitrogen' => 2, // 制氮
|
|
|
'compressed_air' => 3, // 压风
|
|
|
+ 'pump_1' => 4, // 主泵房(768)
|
|
|
],
|
|
|
];
|
|
|
|
|
@@ -107,7 +108,7 @@ class OpcDataController extends BaseController
|
|
|
switch($getDataType) {
|
|
|
case 'compressed_air':
|
|
|
// 压风
|
|
|
- $result = $this->getCompressedAirData($dbResult);
|
|
|
+ $result = $this->getCompressedAirData($dbResult, $getMineCode);
|
|
|
break;
|
|
|
case 'nitrogen':
|
|
|
// 制氮
|
|
@@ -270,12 +271,14 @@ class OpcDataController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // dd($timeArr);
|
|
|
+
|
|
|
return $dataArr;
|
|
|
}
|
|
|
|
|
|
|
|
|
// 压风
|
|
|
- public function getCompressedAirData($dbResult) {
|
|
|
+ public function getCompressedAirData($dbResult, $getMineCode) {
|
|
|
|
|
|
$dataArr = array();
|
|
|
$timeArr = array(); // 用于拼接时分秒
|
|
@@ -291,7 +294,6 @@ class OpcDataController extends BaseController
|
|
|
$devVal = $val->val; // 数值
|
|
|
|
|
|
// $valArr[$jsonKey] = $devVal;
|
|
|
-
|
|
|
if ($jsonKey == 'state') {
|
|
|
$dataArr['compressed_air'][$devNum]['name'] = $devName;
|
|
|
$dataArr['compressed_air'][$devNum]['state'] = $devVal;
|
|
@@ -329,12 +331,22 @@ class OpcDataController extends BaseController
|
|
|
];
|
|
|
$dataArr['compressed_air'][$devNum][$jsonKey][] = $valArr;
|
|
|
} else if ($jsonKey == 'warn_state') {
|
|
|
- $valArr = [
|
|
|
- 'label' => $label, // 标题
|
|
|
- 'state' => $devVal, // 值
|
|
|
- 'unit' => $unit // 单位
|
|
|
- ];
|
|
|
- $dataArr['compressed_air'][$devNum][$jsonKey][] = $valArr;
|
|
|
+
|
|
|
+ if ($getMineCode == 'qingshuiying' && mb_substr($label, -1) == '阀') {
|
|
|
+ $valArr = [
|
|
|
+ 'label' => $label, // 标题
|
|
|
+ 'state' => $devVal > 15 ? 1 : 2, // 值
|
|
|
+ 'unit' => $unit // 单位
|
|
|
+ ];
|
|
|
+ $dataArr['compressed_air'][$devNum][$jsonKey][] = $valArr;
|
|
|
+ } else {
|
|
|
+ $valArr = [
|
|
|
+ 'label' => $label, // 标题
|
|
|
+ 'state' => $devVal, // 值
|
|
|
+ 'unit' => $unit // 单位
|
|
|
+ ];
|
|
|
+ $dataArr['compressed_air'][$devNum][$jsonKey][] = $valArr;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
}
|