加备注

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

@@ -23,13 +23,16 @@ class OpcDataController extends Controller
 
     protected $localConf = [
         'jinjiaqu'    => [
-            'ventilation_zb'    => 1,
-            'ventilation_bb'    => 2,
-            'pump_zy'           => 3,
-            'pump_690'          => 4,
-            'compressed_air'    => 5,
-            'belt_13'           => 6,
-            'hoist'             => 7
+            'ventilation_zb'    => 1,    // 中部通风
+            'ventilation_bb'    => 2,    // 北部通风
+            'pump_zy'           => 3,    // 中央水泵房
+            'pump_690'          => 4,    // 690水泵
+            'compressed_air'    => 5,    // 空压机
+            'belt_13'           => 6,    // 13采区运输机
+            'hoist'             => 7,    // 中部副立井提升机
+            'hoist_1'           => 8,    // 13采区提升机
+            'hoist_2'           => 9,    // 北部副斜井
+            'belt_2'            => 10    // 主斜井胶带运输机
         ],
 
         'shicaocun'    => [
@@ -71,7 +74,8 @@ class OpcDataController extends Controller
                     end val,
                     t1.json_key,
                     t1.row_number,
-                    t1.unit
+                    t1.unit,
+                    t1.group_name
             from equipment t
             join tb_dev_dict_list t1 on t.selItem = t1.selItem
             where t1.group_id = ".$groupId."
@@ -93,10 +97,12 @@ class OpcDataController extends Controller
                 case 'belt_1':
                 case 'belt_2':
                 case 'belt_3':
-                    // 13采区胶带运输机系统
+                    // 运输机系统
                     $result = $this->getBeltData($dbResult);
                     break;
                 case 'hoist':
+                case 'hoist_1':
+                case 'hoist_2':
                     // 提升机
                     $result = $this->getHoistData($dbResult);
                     break;
@@ -383,6 +389,8 @@ class OpcDataController extends Controller
             $devNum     = $val->device_num - 1;         // 设备号
             $unit       = $val->unit;                   // 单位
             $devVal     = $val->val;                    // 数值
+            $group_name = $val->group_name;             // 设备名
+
 
             if ($jsonKey == 'position') {
                 $valArr = [
@@ -408,7 +416,7 @@ class OpcDataController extends Controller
                     'unit'  => $unit        // 单位
                 ];
                 $dataArr['hoist'][$devTypeNum][$jsonKey][] = $valArr;
-                $dataArr['hoist'][$devTypeNum]['name'] = '中部副立井';
+                $dataArr['hoist'][$devTypeNum]['name'] = $group_name;
                 // $dataArr['common']['direction']
             } else {
                 $valArr = [