Browse Source

点位对照

q 1 năm trước cách đây
mục cha
commit
d9e1270266

+ 94 - 109
Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsFanController.php

@@ -398,6 +398,7 @@ class ZQDcsFanController  extends BaseController
         ];
         return json_encode($data);
     }
+
     /*
      * 五六分区1200车场
      */
@@ -474,25 +475,26 @@ class ZQDcsFanController  extends BaseController
         ];
         return json_encode($data);
     }
+
     /*
      * 1314通风
      */
     public function get1314List() {
 
         $keys=[
-            "2009721047624705_2", "2009721036276737_2", "2009721035631617_2",
-            "2009721047067649_2", "2009721035617281_2", "2009721047053313_2",
-            "2009735057300481_1", "2009735057363969_1", "2009735057392641_1",
-            "2009735057468417_1", "2009735057378305_1", "2009735057484801_1",
-            "2009735057349633_1", "2009735057449985_1", "2009735057103873_1",
-            "2009735057161217_1", "2009735057193985_1", "2009735057263617_1",
-            "2009721037777921_1", "2009735057282049_1", "2009735057146881_1",
-            "2009735057247233_1", "2009735057501185_1", "2009735057515521_1",
-            "2009735057529857_1", "2009735057546241_1", "2009721037796353_1",
-            "2009721048970241_1", "2009721038035969_1", "2009721038019585_1",
-            "2009721038052353_1", "2009721038083073_1", "2009721038113793_1",
-            "2009721049226241_1", "2009721049205761_1", "2009721049244673_1",
-            "2009721049283585_1", "2009721049318401_1"
+            "2009721038035969_1","2009721038019585_1","2009721038052353_1",
+            "2009721038083073_1","2009721038113793_1","2009721049226241_1",
+            "2009721049205761_1","2009721049244673_1","2009721049283585_1",
+            "2009721049318401_1","2009721047624705_2","2009721036276737_2",
+            "2009721035631617_2","2009721047067649_2","2009721035617281_2",
+            "2009721047053313_2","2009735057300481_1","2009735057363969_1",
+            "2009735057392641_1","2009735057468417_1","2009735057378305_1",
+            "2009735057484801_1","2009735057349633_1","2009735057449985_1",
+            "2009735057103873_1","2009735057161217_1","2009735057193985_1",
+            "2009735057263617_1","2009721037777921_1","2009735057282049_1",
+            "2009735057146881_1","2009735057247233_1","2009735057501185_1",
+            "2009735057515521_1","2009735057529857_1","2009735057546241_1",
+            "2009721037796353_1","2009721048970241_1"
         ];
 
         $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
@@ -503,16 +505,16 @@ class ZQDcsFanController  extends BaseController
         }
 
         $baseData = $dataFromGetRequest['data'];
-
+        // 电流、功率、振动、负压取的西井通风的点
         $data['tab']=[
             [
-                'title'=>"1#风机",
+                'title'=>"2#风机",
                 'state'=>$baseData['2009721035631617_2'] ?? 0,
                 'list'=>[
                 ]
             ],
             [
-                'title'=>"2#风机",
+                'title'=>"1#风机",
                 'state'=>$baseData['2009721047067649_2'] ?? 0,
                 'list'=>[
                 ]
@@ -530,23 +532,23 @@ class ZQDcsFanController  extends BaseController
                 ],
                 [
                     "label"=>"运行电流(A)",
-                    'value_1'=>$baseData['2009735057300481_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057392641_1'] ?? 0,
+                    'value_1'=>$baseData['2009735057103873_1'] ?? 0,
+                    'value_2'=>$baseData['2009735057193985_1'] ?? 0,
                 ],
                 [
                     "label"=>"运行功率(kw)",
-                    'value_1'=>$baseData['2009735057363969_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057468417_1'] ?? 0,
+                    'value_1'=>$baseData['2009735057161217_1'] ?? 0,
+                    'value_2'=>$baseData['2009735057263617_1'] ?? 0,
                 ],
                 [
                     "label"=>"X振动(mm/s)",
-                    'value_1'=>$baseData['2009735057378305_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057484801_1'] ?? 0,
+                    'value_1'=>$baseData['2009721037777921_1'] ?? 0,
+                    'value_2'=>$baseData['2009735057282049_1'] ?? 0,
                 ],
                 [
                     "label"=>"Y振动(mm/s)",
-                    'value_1'=>$baseData['2009735057349633_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057449985_1'] ?? 0,
+                    'value_1'=>$baseData['2009735057146881_1'] ?? 0,
+                    'value_2'=>$baseData['2009735057247233_1'] ?? 0,
                 ],
                 [
                     "label"=>"负压(pa)",
@@ -568,23 +570,23 @@ class ZQDcsFanController  extends BaseController
                     ],
                     [
                         "label"=>"运行电流(A)",
-                        'value_1'=>$baseData['2009735057103873_1'] ?? 0,
-                        'value_2'=>$baseData['2009735057193985_1'] ?? 0,
+                        'value_1'=>$baseData['2009735057300481_1'] ?? 0,
+                        'value_2'=>$baseData['2009735057392641_1'] ?? 0,
                     ],
                     [
                         "label"=>"运行功率(kw)",
-                        'value_1'=>$baseData['2009735057161217_1'] ?? 0,
-                        'value_2'=>$baseData['2009735057263617_1'] ?? 0,
+                        'value_1'=>$baseData['2009735057363969_1'] ?? 0,
+                        'value_2'=>$baseData['2009735057468417_1'] ?? 0,
                     ],
                     [
                         "label"=>"X振动(mm/s)",
-                        'value_1'=>$baseData['2009721037777921_1'] ?? 0,
-                        'value_2'=>$baseData['2009735057282049_1'] ?? 0,
+                        'value_1'=>$baseData['2009735057378305_1'] ?? 0,
+                        'value_2'=>$baseData['2009735057484801_1'] ?? 0,
                     ],
                     [
                         "label"=>"Y振动(mm/s)",
-                        'value_1'=>$baseData['2009735057146881_1'] ?? 0,
-                        'value_2'=>$baseData['2009735057247233_1'] ?? 0,
+                        'value_1'=>$baseData['2009735057349633_1'] ?? 0,
+                        'value_2'=>$baseData['2009735057449985_1'] ?? 0,
                     ],
                     [
                         "label"=>"负压(pa)",
@@ -682,31 +684,32 @@ class ZQDcsFanController  extends BaseController
         ];
         return json_encode($data);
     }
+
     /*
      * 西井通风
      */
     public function getWestList() {
 
         $keys=[
-            '2008290869144577_1', '2008290869222401_1', '2008290869236737_1',
-            '2008290869253121_1', '2008290869267457_1', '2008290869279745_1',
-            '2008290869292033_1', '2008290869308417_1', '2008290869326849_1',
-            '2008290869345281_1', '2008290869365761_1', '2008290869384193_1',
-            '2008290869404673_1', '2008290869421057_1', '2008290869439489_1',
-            '2008290869457921_1', '2008290869474305_1', '2008290869484545_1',
-            '2008290869498881_1', '2008290869519361_1', '2009735056086017_2',
-            '2009735056098305_2', '2009735056108545_2', '2009735056387073_2',
-            '2009735056399361_2', '2009735056409601_2', '2009735056448513_2',
-            '2009735056724993_2', '2009735056749569_2', '2009735056907265_2',
-            '2009735056929793_2', '2009735057116161_1', '2009735057130497_1',
-            '2009735057146881_1', '2009735057161217_1', '2009735057177601_1',
-            '2009735057212417_1', '2009735057230849_1', '2009735057247233_1',
-            '2009735057263617_1', '2009735057282049_1', '2009735057314817_1',
-            '2009735057331201_1', '2009735057349633_1', '2009735057363969_1',
-            '2009735057378305_1', '2009735057413121_1', '2009735057431553_1',
-            '2009735057449985_1', '2009735057468417_1', '2009735057484801_1',
-            '2009735057501185_1', '2009735057515521_1', '2009735057529857_1',
-            '2009735057546241_1'
+            "2008290869144577_1","2008290869222401_1","2008290869236737_1",
+            "2008290869253121_1","2008290869267457_1","2008290869279745_1",
+            "2008290869292033_1","2008290869308417_1","2008290869326849_1",
+            "2008290869345281_1","2008290869365761_1","2008290869384193_1",
+            "2008290869404673_1","2008290869421057_1","2008290869439489_1",
+            "2008290869457921_1","2008290869474305_1","2008290869484545_1",
+            "2008290869498881_1","2008290869519361_1","2009735056086017_2",
+            "2009735056098305_2","2009735056108545_2","2009735056387073_2",
+            "2009735056399361_2","2009735056409601_2","2009735056724993_2",
+            "2009735056737281_2","2009735056749569_2","2009735056907265_2",
+            "2009735056919553_2","2009735056929793_2","2009735057103873_1",
+            "2009735057116161_1","2009735057146881_1","2009735057161217_1",
+            "2009735057177601_1","2009735057193985_1","2009735057212417_1",
+            "2009735057247233_1","2009735057263617_1","2009735057282049_1",
+            "2009735057300481_1","2009735057314817_1","2009735057349633_1",
+            "2009735057363969_1","2009735057378305_1","2009735057392641_1",
+            "2009735057413121_1","2009735057449985_1","2009735057468417_1",
+            "2009735057484801_1","2009735057501185_1","2009735057515521_1",
+            "2009735057529857_1","2009735057546241_1"
         ];
 
         $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
@@ -718,10 +721,12 @@ class ZQDcsFanController  extends BaseController
 
         $baseData = $dataFromGetRequest['data'];
 
+        // 风速和电压是假数据,风门状态不确定
+
         $data['tab']=[
             [
                 'title'=>"1#风机",
-                'state'=>$baseData['2009735056141313_2'] ?? 0,
+                'state'=>$baseData['2009735056108545_2'] ?? 0,
                 'list'=>[
                     [
                         'label'=>'体积流量',
@@ -737,7 +742,7 @@ class ZQDcsFanController  extends BaseController
             ],
             [
                 'title'=>"2#风机",
-                'state'=>$baseData['2009735056448513_2'] ?? 0,
+                'state'=>$baseData['2009735056749569_2'] ?? 0,
                 'list'=>[
                     [
                         'label'=>'体积流量',
@@ -760,8 +765,8 @@ class ZQDcsFanController  extends BaseController
                 [
                     "label"=>"负压(Pa)",
                     "type"=>"val",
-                    'value_1'=>$baseData['2009735057501185_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057515521_1'] ?? 0,
+                    'value_1'=>$baseData['2009735057501185_1'] * 10 ?? 0,
+                    'value_2'=>$baseData['2009735057515521_1'] * 10 ?? 0,
                 ],
                 [
                     "label"=>"运行频率(HZ)",
@@ -770,10 +775,10 @@ class ZQDcsFanController  extends BaseController
                     'value_2'=>$baseData['2009735057212417_1'] ?? 0,
                 ],
                 [
-                    "label"=>"设定频率(HZ)",
+                    "label"=>"运行电流(A)",
                     "type"=>"val",
-                    'value_1'=>$baseData['2009735057130497_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057230849_1'] ?? 0,
+                    'value_1'=>$baseData['2009735057103873_1'] ?? 0,
+                    'value_2'=>$baseData['2009735057193985_1'] ?? 0,
                 ],
                 [
                     "label"=>"运行电压(V)",
@@ -837,10 +842,10 @@ class ZQDcsFanController  extends BaseController
                     'value_2'=>$baseData['2009735057413121_1'] ?? 0,
                 ],
                 [
-                    "label"=>"设定频率(HZ)",
+                    "label"=>"运行电流(A)",
                     "type"=>"val",
-                    'value_1'=>$baseData['2009735057331201_1'] ?? 0,
-                    'value_2'=>$baseData['2009735057431553_1'] ?? 0,
+                    'value_1'=>$baseData['2009735057300481_1'] ?? 0,
+                    'value_2'=>$baseData['2009735057392641_1'] ?? 0,
                 ],
                 [
                     "label"=>"运行电压(V)",
@@ -881,8 +886,8 @@ class ZQDcsFanController  extends BaseController
                 [
                     "label"=>"允许信号",
                     "type"=>"val",
-                    'value_1'=>$baseData['2009735056399361_2'] ?? 0,
-                    'value_2'=>$baseData['2009735056098305_2'] ?? 0,
+                    'value_1'=>$baseData['2009735056737281_2'] ?? 0,
+                    'value_2'=>$baseData['2009735056919553_2'] ?? 0,
                 ],
             ]
         ];
@@ -974,54 +979,31 @@ class ZQDcsFanController  extends BaseController
         ];
         return json_encode($data);
     }
+
     /*
      * 东井通风
      */
     public function getEastList() {
 
         $keys=[
-            '2008298770912257_2',
-            '2008298771235841_2',
-            '2008298771575809_2',
-            '2008298771760129_2',
-            '2008298770922497_2',
-            '2008298771252225_2',
-            '2008298771590145_2',
-            '2008298771774465_2',
-            '2008298771971073_1',
-            '2008298772339713_1',
-            '2008298772696065_1',
-            '2008298772747265_1',
-            '2008298770955265_2',
-            '2008298771299329_2',
-            '2008298771627009_2',
-            '2008298771809281_2',
-            '2008298771987457_1',
-            '2008298772354049_1',
-            '2008298772714497_1',
-            '2008298772763649_1',
-            '2008298772003841_1',
-            '2008298772370433_1',
-            '2008298772730881_1',
-            '2008298772780033_1',
-            '2008298772069377_1',
-            '2008298772388865_1',
-            '2008298772323329_1',
-            '2008298772677633_1',
-            '2008319841133569_2',
-            '2008319841389569_2',
-
-            '2008298772225025_1',
-            '2008298772464641_1',
-            '2008298772485121_1',
-            '2008298772503553_1',
-            '2008298772425729_1',
-            '2008298772444161_1',
-            '2008298772624385_1',
-            '2008298772642817_1',
-            '2008298772657153_1',
-            '2008298772589569_1',
-            '2008298772605953_1',
+            "2008298770912257_2","2008298770922497_2","2008298770955265_2",
+            "2008298771235841_2","2008298771252225_2","2008298771299329_2",
+            "2008298771575809_2","2008298771590145_2","2008298771627009_2",
+            "2008298771760129_2","2008298771774465_2","2008298771809281_2",
+            "2008298771971073_1","2008298771987457_1","2008298772003841_1",
+            "2008298772069377_1","2008298772089857_1","2008298772098049_1",
+            "2008298772108289_1","2008298772118529_1","2008298772132865_1",
+            "2008298772149249_1","2008298772163585_1","2008298772208641_1",
+            "2008298772225025_1","2008298772239361_1","2008298772255745_1",
+            "2008298772274177_1","2008298772323329_1","2008298772339713_1",
+            "2008298772354049_1","2008298772370433_1","2008298772388865_1",
+            "2008298772425729_1","2008298772444161_1","2008298772464641_1",
+            "2008298772485121_1","2008298772503553_1","2008298772524033_1",
+            "2008298772542465_1","2008298772589569_1","2008298772605953_1",
+            "2008298772624385_1","2008298772642817_1","2008298772657153_1",
+            "2008298772677633_1","2008298772696065_1","2008298772714497_1",
+            "2008298772730881_1","2008298772747265_1","2008298772763649_1",
+            "2008298772780033_1","2008319841133569_2","2008319841389569_2"
         ];
 
         $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
@@ -1033,6 +1015,7 @@ class ZQDcsFanController  extends BaseController
 
         $baseData = $dataFromGetRequest['data'];
 
+        // 风量从接口取的对不上数据
         $data['tab']=[
             [
                 'title'=>"1#风机",
@@ -1274,13 +1257,15 @@ class ZQDcsFanController  extends BaseController
 
             $sqlStr = "select distinct `point_id`, `point_name` from `dcs_point_final_dic` where `sys_num` = $type";
             $res = $this->executeSql($sqlStr, $type);
+            // return $res;
             $keys=[];
             $keys_dic=[];
             for ($i = 0; $i < count($res); $i++) {
-                $data=$res[$i];
-                $key=$data->point_id;
-                $keyName=$data->point_name;
-                $keys[]=$data->$key;
+                // $data=$res[$i];
+                // return $data;
+                $key=$res[$i]->point_id;
+                $keyName=$res[$i]->point_name;
+                $keys[]=$key;
                 $keys_dic[$key]=$keyName;
             }