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

Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsFanController.php

@@ -81,14 +81,27 @@ class ZQDcsFanController  extends BaseController
             ,"2009721035631617_2", "2009721047067649_2" // 1314立井
             ,"2074993339513857_2", "2074993343917057_2" // 13207机巷
             ,"2063316486075393_2", "2063316488862721_2" // 250602回风巷
-            ,"2059629794612225_2", "2059629795228673_2" // 110207机巷 -
-//            ,"2059629794612225_2", "2059629795228673_2" // 110207回风巷 -
             ,"2074999786576897_2", "2074999790310401_2" // 五六分区220708回风巷
             ,"2046522721719297_2", "2046522723800065_2" // 五六分区220708胶带巷
             ,"2046535459097601_2", "2046535461340161_2" // 五六分区220708辅助巷
             ,"2049479116037121_2", "2049479116065793_2", "2049479118597121_2", "2049479118623745_2" // 五六分区1200石门 150201回风巷通风机
             ,"2049479008105473_2", "2049479008132097_2" // 五六分区1200车场 150201机巷通风机
-            ,"2008681964219393_2", "2008682656793601_2" // 五分区通风系统
+            ,"2008681964219393_2", "2008682656793601_2", // 五分区通风系统
+
+            "2074957345481729_1", // 110207机巷电流
+            "2074957345532929_1", // 110207机巷电流
+            "2074957345598465_1", // 110207机巷电流
+            "2074957345651713_1", // 110207机巷电流
+            "2074957345965057_1", // 110207机巷电流
+            "2074957346026497_1", // 110207机巷电流
+            "2074957344244737_1", // 110207机巷电流
+            "2074957344297985_1", // 110207机巷电流
+            "2074957344345089_1", // 110207机巷电流
+            "2074957344390145_1", // 110207机巷电流
+            "2074957344433153_1", // 110207机巷电流
+            "2074957344476161_1", // 110207机巷电流
+
+
         ];
 
         // 获取点位数据
@@ -330,13 +343,23 @@ class ZQDcsFanController  extends BaseController
                     "info"=>[
                         [
                             "label"=>"1#风机",
-                            "state"=>$baseData['2059629794612225_2'] ?? 0,
-                            "text"=>"停止"
+                            'state'=>
+                                $baseData['2074957344244737_1'] + $baseData['2074957344345089_1'] + $baseData['2074957344433153_1'] +
+                                $baseData['2074957344297985_1'] + $baseData['2074957344390145_1'] + $baseData['2074957344476161_1'] > 0,
+                            "text"=>
+                                $baseData['2074957344244737_1'] + $baseData['2074957344345089_1'] + $baseData['2074957344433153_1'] +
+                                $baseData['2074957344297985_1'] + $baseData['2074957344390145_1'] + $baseData['2074957344476161_1'] > 0
+                            ? "运行" : "停止",
                         ],
                         [
                             "label"=>"2#风机",
-                            "state"=>$baseData['2059629795228673_2'] ?? 0,
-                            "text"=>"运行"
+                            'state'=>
+                                $baseData['2074957345481729_1'] + $baseData['2074957345532929_1'] + $baseData['2074957345598465_1'] +
+                                $baseData['2074957345651713_1'] + $baseData['2074957345965057_1'] + $baseData['2074957346026497_1'] > 0,
+                            "text"=>
+                                $baseData['2074957345481729_1'] + $baseData['2074957345532929_1'] + $baseData['2074957345598465_1'] +
+                                $baseData['2074957345651713_1'] + $baseData['2074957345965057_1'] + $baseData['2074957346026497_1'] > 0
+                            ? "运行" : "停止",
                         ]
                     ]
                 ],
@@ -630,13 +653,21 @@ class ZQDcsFanController  extends BaseController
     public function get110207jxList() {
 
         $keys=[
-            "2059629797024769_1","2059629797067777_1","2059629797108737_1","2059629797192705_1",
-            "2059629797233665_1","2059629797274625_1","2059629795988481_1","2059629796031489_1",
-            "2059629796072449_1","2059629796158465_1","2059629796199425_1","2059629796238337_1",
-            "2059629794612225_2","2059629795228673_2","2059629794855937_2","2059629795525633_2",
-            "2059629798036481_1","2059629796819969_1","2059629796609025_1","2059629797950465_1",
-            "2059629797708801_1","2060356330568705_1","2060356330460161_1","2059629796858881_1",
-            "2059629797995521_1",
+            "2074957346257921_1",
+            "2074957344537601_1",
+            "2074957346079745_1",
+            "2074957344244737_1",
+            "2074957345481729_1",
+            "2074957344345089_1",
+            "2074957345598465_1",
+            "2074957344433153_1",
+            "2074957345965057_1",
+            "2074957344297985_1",
+            "2074957345532929_1",
+            "2074957344390145_1",
+            "2074957345651713_1",
+            "2074957344476161_1",
+            "2074957346026497_1",
         ];
 
         $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
@@ -648,59 +679,23 @@ class ZQDcsFanController  extends BaseController
 
         $baseData = $dataFromGetRequest['data'];
 
+        foreach ($keys as $key) {
+            $baseData[$key] = $baseData[$key] ?? 0;
+        }
+
         $data['tab']=[
             [
                 'title'=>"主风机",
-                'state'=>  $baseData['2059629794612225_2'] ?? 0,
-                'list'=>[
-                    [
-                        'label'=>'风速',
-                        "unit"=>"m/s",
-                        "num"=> $baseData['2059629798036481_1'] ?? 0,
-                    ],
-                    [
-                        'label'=>'电池电压',
-                        "unit"=>"V",
-                        "num"=> $baseData['2060356330568705_1'] ?? 0,
-                    ],
-                    [
-                        'label'=>'1号电机',
-                        "unit"=>"",
-                        "num"=> $baseData['2059629794612225_2'] ?? 0,
-                    ],
-                    [
-                        "label"=>"2号电机",
-                        "unit"=>"",
-                        "num"=> $baseData['2059629794855937_2'] ?? 0,
-                    ],
-                ]
+                'state'=>
+                    $baseData['2074957344244737_1'] + $baseData['2074957344345089_1'] + $baseData['2074957344433153_1'] +
+                    $baseData['2074957344297985_1'] + $baseData['2074957344390145_1'] + $baseData['2074957344476161_1'] > 0,
             ],
             [
                 'title'=>"副风机",
-                'state'=>$baseData['2059629795228673_2'] ?? 0,
-                'list'=>[
-                    [
-                        'label'=>'风速',
-                        "unit"=>"m/s",
-                        "num"=> $baseData['2059629798036481_1'] ?? 0,
-                    ],
-                    [
-                        'label'=>'电池电量',
-                        "unit"=>"%",
-                        "num"=> $baseData['2060356330460161_1'] ?? 0,
-                    ],
-                    [
-                        'label'=>'1号电机',
-                        "unit"=>"",
-                        "num"=>$baseData['2059629795228673_2'] ?? 0,
-                    ],
-                    [
-                        "label"=>"2号电机",
-                        "unit"=>"",
-                        "num"=>$baseData['2059629795525633_2'] ?? 0,
-                    ],
-                ]
-            ]
+                'state'=>
+                    $baseData['2074957345481729_1'] + $baseData['2074957345532929_1'] + $baseData['2074957345598465_1'] +
+                    $baseData['2074957345651713_1'] + $baseData['2074957345965057_1'] + $baseData['2074957346026497_1'] > 0,
+            ],
         ];
 
         $data['table_1']=[
@@ -709,44 +704,44 @@ class ZQDcsFanController  extends BaseController
             ],
             "tbody"=>[
                 [
-                    'label'=>'电压（V）',
-                    'value_1'=>$baseData['2059629796609025_1'] ?? 0,
-                    'value_2'=>$baseData['2059629797708801_1'] ?? 0,
+                    'label'=>'风速（m/s）',
+                    'value_1'=>$baseData['2074957346257921_1'] ?? 0,
+                    'value_2'=>"",
                 ],
                 [
-                    "label"=>"前级A相电流（A）",
-                    'value_1'=>$baseData['2059629795988481_1'] ?? 0,
-                    'value_2'=>$baseData['2059629797024769_1'] ?? 0,
+                    'label'=>'电压（V）',
+                    'value_1'=>$baseData['2074957344537601_1'] ?? 0,
+                    'value_2'=>$baseData['2074957346079745_1'] ?? 0,
                 ],
                 [
-                    "label"=>"前级B相电流（A）",
-                    'value_1'=>$baseData['2059629796031489_1'] ?? 0,
-                    'value_2'=>$baseData['2059629797067777_1'] ?? 0,
+                    "label"=>"Ia电流1（A）",
+                    'value_1'=>$baseData['2074957344244737_1'] ?? 0,
+                    'value_2'=>$baseData['2074957345481729_1'] ?? 0,
                 ],
                 [
-                    "label"=>"前级C相电流（A）",
-                    'value_1'=>$baseData['2059629796072449_1'] ?? 0,
-                    'value_2'=>$baseData['2059629797108737_1'] ?? 0,
+                    "label"=>"Ib电流1（A）",
+                    'value_1'=>$baseData['2074957344345089_1'] ?? 0,
+                    'value_2'=>$baseData['2074957345598465_1'] ?? 0,
                 ],
                 [
-                    "label"=>"后级A相电流（A）",
-                    'value_1'=>$baseData['2059629796158465_1'] ?? 0,
-                    'value_2'=>$baseData['2059629797192705_1'] ?? 0,
+                    "label"=>"Ic电流1（A）",
+                    'value_1'=>$baseData['2074957344433153_1'] ?? 0,
+                    'value_2'=>$baseData['2074957345965057_1'] ?? 0,
                 ],
                 [
-                    "label"=>"后级B相电流（A）",
-                    'value_1'=>$baseData['2059629796199425_1'] ?? 0,
-                    'value_2'=>$baseData['2059629797233665_1'] ?? 0,
+                    "label"=>"Ia电流2（A）",
+                    'value_1'=>$baseData['2074957344297985_1'] ?? 0,
+                    'value_2'=>$baseData['2074957345532929_1'] ?? 0,
                 ],
                 [
-                    "label"=>"后级C相电流（A）",
-                    'value_1'=>$baseData['2059629796238337_1'] ?? 0,
-                    'value_2'=>$baseData['2059629797274625_1'] ?? 0,
+                    "label"=>"Ib电流2（A）",
+                    'value_1'=>$baseData['2074957344390145_1'] ?? 0,
+                    'value_2'=>$baseData['2074957345651713_1'] ?? 0,
                 ],
                 [
-                    "label"=>"额定电流（A）",
-                    'value_1'=>$baseData['2059629796858881_1'] ?? 0,
-                    'value_2'=>$baseData['2059629797995521_1'] ?? 0,
+                    "label"=>"Ic电流2（A）",
+                    'value_1'=>$baseData['2074957344476161_1'] ?? 0,
+                    'value_2'=>$baseData['2074957346026497_1'] ?? 0,
                 ]
             ]
         ];