清水营生活水接口

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

@@ -72,6 +72,9 @@ class OpcDataController extends BaseController
             'pump_2'            => 5,  // 11采区水泵房
             'compressed_air_1'  => 6,  // 副立井压风
             'belt_1'            => 7,  // 主运输1号皮带
+            'life_water_1'      => 8,  // 生活水
+            'life_water_2'      => 9,  // 生产水
+            'life_water_3'      => 10,  // 消防水
         ],
     ];
     
@@ -640,16 +643,19 @@ class OpcDataController extends BaseController
             $group_name = $val->group_name;             // 设备名
             
             $valArr = array();
-            if ($jsonKey == 'trans_box') {
+            if ($jsonKey == 'trans_box' || $jsonKey == 'trans_box_state' ) {
 
                 $dataArr['cabinet'][$devTypeNum]['title'] = $devName;
-                $dataArr['cabinet'][$devTypeNum]['data'][$devNum]['name'] = ($devNum + 1).'号供水泵';
-                $valArr = [
-                    'name' => $label,      // 标题
-                    'state' => $devVal,     // 值
-                ];
-
-                $dataArr['cabinet'][$devTypeNum]['data'][$devNum]['state_list'][] = $valArr;
+                $dataArr['cabinet'][$devTypeNum]['data'][$devNum]['name'] = ($devNum + 1).'号泵';
+                if ($jsonKey == 'trans_box_state') {
+                    $dataArr['cabinet'][$devTypeNum]['data'][$devNum]['state'] = $devVal;
+                }
+                    $valArr = [
+                        'name' => $label,      // 标题
+                        'state' => $devVal,     // 值
+                    ];
+    
+                    $dataArr['cabinet'][$devTypeNum]['data'][$devNum]['state_list'][] = $valArr;
                 
             } else if ($jsonKey == 'trans_box_state') {
                 $dataArr['cabinet'][$devTypeNum]['state'] = $devVal;