Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master

Modules/OpcData/Http/Controllers/Api/OpcDataController.php

@@ -33,12 +33,17 @@ class OpcDataController extends Controller
         ],
 
         'shicaocun'    => [
-            'fan_1'             => 1,
-            'fan_2'             => 2,
-            'pump_1'            => 3,
-            'pump_2'            => 4,
-            'pump_3'            => 5,
-            'compressed_air'    => 6,
+            'fan_1'             => 1,  // 1号回风（主通风）
+            'fan_2'             => 2,  // 2号回风
+            'pump_1'            => 3,  // 主泵房（900）
+            'pump_2'            => 4,  // 715水泵
+            'pump_3'            => 5,  // 630水泵
+            'compressed_air'    => 6,  // 空压
+            'nitrogen'          => 7,  // 制氮
+
+            'belt_1'            => 8,  // 22采区
+            'belt_2'            => 9,  // 西翼巷
+            'belt_3'            => 10, // 集中巷
         ],
     ];
     
@@ -80,7 +85,14 @@ class OpcDataController extends Controller
                     // 压风
                     $result = $this->getCompressedAirData($dbResult);
                     break;
+                case 'nitrogen':
+                    // 制氮
+                    $result = $this->getNitrogenData($dbResult);
+                    break;
                 case 'belt_13':
+                case 'belt_1':
+                case 'belt_2':
+                case 'belt_3':
                     // 13采区胶带运输机系统
                     $result = $this->getBeltData($dbResult);
                     break;
@@ -118,7 +130,7 @@ class OpcDataController extends Controller
 
     // 风机
     public function getFanData($dbResult) {
-
+        $dataArr = array();
         foreach ($dbResult as $key => $val) {
             $fanNum     = $val->dev_type_id - 1;        // 风机号
             $label      = $val->device_name;            // 设备名
@@ -292,13 +304,15 @@ class OpcDataController extends Controller
             }
             
         }
-        return $dataArr;
+        if (isset($dataArr)) {
+            return $dataArr;
+        }
     }
 
 
 
     public function getBeltData($dbResult) {
-
+        // dd($dbResult);
         $valDict = array();
         foreach ($dbResult as $key => $val) {
             $devName    = $val->dev_type_name;          // 泵名
@@ -319,6 +333,7 @@ class OpcDataController extends Controller
                     'unit'  => $unit        // 单位
                 ];
                 $dataArr[$jsonKey][] = $valArr;
+
             } else if ($jsonKey == 'state') {
                 $dataArr['state'] = $devVal;
                 $dataArr['name'] = $label;
@@ -342,7 +357,7 @@ class OpcDataController extends Controller
         }
         foreach ($valDict as $key => $val) {
             $i = 0;
-            foreach ($val as $valKey => $valVal) { 
+            foreach ($val as $valKey => $valVal) {
                 $dataArr[$key][$i]['label'] = $valKey;
                 $dataArr[$key][$i]['value_list'] = $valVal;
                 $i++;
@@ -407,4 +422,42 @@ class OpcDataController extends Controller
         $dataArr['hoist'][0]['state'] = $state;
         return $dataArr;
     }
+
+    // 制氮
+    public function getNitrogenData($dbResult) {
+        
+        $valDict = array();
+        $state = 2;
+        
+        foreach ($dbResult as $key => $val) {
+            $devName    = $val->dev_type_name;          // 泵名
+            $rowNumber  = $val->row_number;             // 排序
+            $jsonKey    = $val->json_key;               // json键值
+            $label      = $val->device_name;            // 设备名
+            $devTypeNum = $val->dev_type_id;        // 设备号
+            $devNum     = $val->device_num - 1;         // 设备号
+            $unit       = $val->unit;                   // 单位
+            $devVal     = $val->val;                    // 数值
+
+            if ($jsonKey == 'state') {
+                $dataArr[$devNum]['state'] = $devVal;
+                $dataArr[$devNum]['name'] = $devName;
+            } else if ($jsonKey == 'run_parameter' || $jsonKey == 'cold_dryer') {
+                $valArr = [
+                    'label' => $label,      // 标题
+                    'value' => $devVal,     // 值
+                    'unit'  => $unit        // 单位
+                ];
+                $dataArr[$devNum][$jsonKey][] = $valArr;
+            } else if ($jsonKey == 'tap_state') {
+                $valArr = [
+                    'label' => $label,      // 标题
+                    'state' => $devVal,     // 值
+                ];
+                $dataArr[$devNum][$jsonKey][] = $valArr;
+
+            }
+        }
+        return $dataArr;
+    }
 }