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

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

@@ -61,6 +61,7 @@ class OpcDataController extends BaseController
             'life_water_1'      => 7,  // 矿区生活水
             'life_water_2'      => 8,  // 副立井生活水
             'hoist'             => 9,  // 副立井提升机
+            'water_point'       => 10,  // 供水站子系统
         ],
 
         'qingshuiying'    => [
@@ -87,7 +88,8 @@ class OpcDataController extends BaseController
             $groupId = $this->localConf[$getMineCode][$getDataType];
 
             $sqlStr = "
-            select t1.dev_type_id,
+            select distinct
+                    t1.dev_type_id,
                     t1.dev_type_name,
                     t1.device_num,
                     t1.device_name,
@@ -169,6 +171,9 @@ class OpcDataController extends BaseController
                 case 'life_water_2';
                     $result = $this->getLieWaterData($dbResult);
                     break;
+                case 'water_point';
+                $result = $this->getLieWaterPointData($dbResult);
+                    break;
             }
             if (isset($result)) {
                 return response()->json($result);
@@ -620,6 +625,7 @@ class OpcDataController extends BaseController
         $dataArr = array();
         $valDict = array();
         $state = 2;
+
         // dd($dbResult);
 
         foreach ($dbResult as $key => $val) {
@@ -635,35 +641,85 @@ class OpcDataController extends BaseController
             
             $valArr = array();
             if ($jsonKey == 'trans_box') {
+
+                $dataArr['cabinet'][$devTypeNum]['title'] = $devName;
+                $dataArr['cabinet'][$devTypeNum]['data'][$devNum]['name'] = ($devNum + 1).'号供水泵';
                 $valArr = [
-                    'label' => $label,      // 标题
-                    'value' => $devVal,     // 值
-                    'unit'  => $unit        // 单位
+                    'name' => $label,      // 标题
+                    'state' => $devVal,     // 值
                 ];
-                $dataArr[$jsonKey]['data'][$devTypeNum]['data'][$devNum][] = $valArr;
 
-                $dataArr[$jsonKey]['data'][$devTypeNum]['name'] = $devName;
-                $dataArr[$jsonKey]['info'] = '变频器';
+                $dataArr['cabinet'][$devTypeNum]['data'][$devNum]['state_list'][] = $valArr;
                 
             } else if ($jsonKey == 'trans_box_state') {
-                $dataArr['trans_box']['data'][$devTypeNum]['state'] = $devVal;
-            } else if ($jsonKey == 'parameter_state') {
+                $dataArr['cabinet'][$devTypeNum]['state'] = $devVal;
+            } else if ($jsonKey == 'state_list') {
                 $valArr = [
                     'label' => $label,      // 标题
                     'state' => $devVal,     // 值
                 ];
-                $dataArr[$jsonKey]['data'][] = $valArr;
-                $dataArr[$jsonKey]['info'] = '状态值';
-            } else if ($jsonKey == 'parameter_data') {
+                $dataArr[$jsonKey][] = $valArr;
+            } else if ($jsonKey == 'parameter') {
                 $valArr = [
                     'label' => $label,      // 标题
                     'value' => $devVal,     // 值
                     'unit'  => $unit        // 单位
                 ];
-                $dataArr[$jsonKey]['data'][] = $valArr;
-                $dataArr[$jsonKey]['info'] = '变量值';
+                $dataArr[$jsonKey][] = $valArr;
             }
         }
+
+        return $dataArr;
+    }
+
+
+    // 供水站子系统
+    public function getLieWaterPointData($dbResult) {
+        $dataArr = array();
+        $valDict = array();
+        $state = 2;
+
+        // dd($dbResult);
+
+        foreach ($dbResult as $key => $val) {
+            $devName    = $val->dev_type_name;          // 泵名
+            $label      = $val->device_name;            // 设备名
+            $rowNumber  = $val->row_number;             // 排序
+            $jsonKey    = $val->json_key;               // json键值
+            $devTypeNum = $val->dev_type_id - 1;        // 设备号
+            $devNum     = $val->device_num - 1;         // 设备号
+            $unit       = $val->unit;                   // 单位
+            $devVal     = $val->val;                    // 数值
+            $group_name = $val->group_name;             // 设备名
+            
+            $valArr = array();
+            if ($jsonKey == 'common') {
+                
+                $valArr = [
+                    'name' => $label,      // 标题
+                    'value' => $devVal,    // 值
+                    'unit' => $unit,       // 单位
+                ];
+
+                $dataArr['common'][$devNum]['name'] = $devName;
+                $dataArr['common'][$devNum]['data'][] = $valArr;
+                
+            } else if ($jsonKey == 'cabinet') {
+
+                $valArr = [
+                    'name' => $label,     // 标题
+                    'state' => $devVal,     // 值
+                ];
+                
+                $dataArr['cabinet']['title'] = '供水站变频柜参数';
+                $dataArr['cabinet']['data'][$devNum]['name'] = $devName; // 供水泵名
+                $dataArr['cabinet']['data'][$devNum]['state_list'][] = $valArr;
+
+            } else if ($jsonKey == 'cabinet_statue') {
+                $dataArr['cabinet']['data'][$devNum]['state'] = $devVal; // 供水泵名
+            }
+        }
+
         return $dataArr;
     }
 }