通风主界面接口测试

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

@@ -83,16 +83,16 @@ class ZQDcsFanController  extends BaseController
             ,"2063316486075393_2", "2063316488862721_2" // 250602回风巷
             ,"2059629794612225_2", "2059629795228673_2" // 110207机巷 -
 //            ,"2059629794612225_2", "2059629795228673_2" // 110207回风巷 -
-            ,"2074999786576897_2", "2074999790310401_2" // 五六分区220708胶带巷
+            ,"2074999786576897_2", "2074999790310401_2" // 五六分区220708回风巷
+            ,"2046522721719297_2", "2046522723800065_2" // 五六分区220708胶带巷
             ,"2046535459097601_2", "2046535461340161_2" // 五六分区220708辅助巷
-            ,"2046522721719297_2", "2046522723800065_2" // 五六分区1200石门
-            ,"2049479008105473_2", "2049479008132097_2" // 五六分区1200车场
+            ,"2046522721719297_2", "2046522723800065_2" // 五六分区1200石门 150201回风巷通风机
+            ,"2049479008105473_2", "2049479008132097_2" // 五六分区1200车场 150201机巷通风机
             ,"2008681964219393_2", "2008682656793601_2" // 五分区通风系统
         ];
 
         // 获取点位数据
-        $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
-
+        // $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
 
         // 获取风门数据
         // 自动风门 http://7.250.4.5:1434/zqk/api/AutomaticAirDoors/AutomaticAirDoor
@@ -103,14 +103,16 @@ class ZQDcsFanController  extends BaseController
         $autoWindDevicesUrl = 'http://7.250.4.5:1434/zqk/api/AutomaticWindDevices/AutomaticWindDevice';
         $LocalFansUrl = 'http://7.250.4.5:1434/zqk/api/LocalFans/LocalFan';
 
-        $autoAirDoorsData = $this->apiService->postApiData($autoAirDoorsUrl);
-        $autoWindDevicesData = $this->apiService->postApiData($autoWindDevicesUrl);
-        $LocalFansData = $this->apiService->postApiData($LocalFansUrl);
 
-        // 获取饼图数据（数据库）
-        // cq.wind.online_chart
+        $autoAirDoorsData = $this->apiService->getApiData($autoAirDoorsUrl);
+        $autoWindDevicesData = $this->apiService->getApiData($autoWindDevicesUrl);
+        $LocalFansData = $this->apiService->getApiData($LocalFansUrl);
+
+         // 获取饼图数据（数据库）
+         // cq.wind.online_chart
         $data = "{'analysisSign': 'JSecf85ff100843272', 'analysisTime': '2022-11-21 08:40:08', 'circutCount': 104, 'diagonalCount': 42, 'balanceRatio': 1, 'holeArea': 4.83, 'returnRatio': 0.13, 'returnHf': 20356, 'richFactor': 1, 'airEffcient': 0, 'needTotalQuantity': 16052, 'needQuantity': 15052, 'totalQuantity': 17908, 'vaildWindRate': 0.89635915, 'dsr': 1.0664364}";
-        $windArr = json_decode($data);
+        $data = str_replace("'", '"', $data);
+        $windData = json_decode($data, true);
 
         $info = [
             "charData_1"=>[
@@ -118,11 +120,11 @@ class ZQDcsFanController  extends BaseController
                     "data"=>[
                         [
                             "name"=>"有效风",
-                            "value"=>0
+                            "value"=>round($windData['vaildWindRate'], 1)
                         ],
                         [
                             "name"=>"无效风",
-                            "value"=>0
+                            "value"=>1-round($windData['vaildWindRate'], 1)
                         ]
                     ]
                 ]
@@ -132,11 +134,11 @@ class ZQDcsFanController  extends BaseController
                     "data"=>[
                         [
                             "name"=>"供风量",
-                            "value"=>0
+                            "value"=>$windData['needTotalQuantity']
                         ],
                         [
                             "name"=>"需风量",
-                            "value"=>15052
+                            "value"=>$windData['needQuantity']
                         ]
                     ]
                 ]
@@ -144,15 +146,15 @@ class ZQDcsFanController  extends BaseController
             "info"=>[
                 [
                     "label"=>"自动风门",
-                    "value"=>"2扇"
+                    "value"=>count($autoAirDoorsData['data'])."扇"
                 ],
                 [
                     "label"=>"自动风窗",
-                    "value"=>"2扇"
+                    "value"=>count($autoWindDevicesData['data'])."扇"
                 ],
                 [
                     "label"=>"变频风扇",
-                    "value"=>"2扇"
+                    "value"=>count($LocalFansData['data'])."扇"
                 ]
             ],
             "list"=>[
@@ -162,34 +164,212 @@ class ZQDcsFanController  extends BaseController
                     "info"=>[
                         [
                             "label"=>"1#风机",
-                            "state"=>0,
+                            "state"=>$baseData['2008319841133569_2'] ?? 0,
                             "text"=>"停止"
                         ],
                         [
                             "label"=>"2#风机",
-                            "state"=>1,
+                            "state"=>$baseData['2008298772323329_1'] ?? 0,
                             "text"=>"运行"
                         ]
                     ]
                 ],
                 [
                     "title"=>"西井通风机",
-                    "sys_code"=>"east",
+                    "sys_code"=>"west",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData['2009735056108545_2'] ?? 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData['2009735056749569_2'] ?? 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"1314立井通风机",
+                    "sys_code"=>"1314",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData['2009721035631617_2'] ?? 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData['2009721047067649_2'] ?? 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"五分区通风机",
+                    "sys_code"=>"5fq",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData['2008681964219393_2'] ?? 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData['2008682656793601_2'] ?? 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
+
+                [
+                    "title"=>"150201回风巷通风机",
+                    "sys_code"=>"1200sm",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData['2046522721719297_2'] ?? 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData['2046522723800065_2'] ?? 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"150201机巷通风机",
+                    "sys_code"=>"1200car",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData['2049479008105473_2'] ?? 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData['2049479008132097_2'] ?? 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"220708辅助巷",
+                    "sys_code"=>"220708fzx",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData['2046535459097601_2'] ?? 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData['2046535461340161_2'] ?? 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"220708回风巷",
+                    "sys_code"=>"220708hfx",
                     "info"=>[
                         [
                             "label"=>"1#风机",
-                            "state"=>0,
+                            "state"=>$baseData['2074999786576897_2'] ?? 0,
                             "text"=>"停止"
                         ],
                         [
                             "label"=>"2#风机",
-                            "state"=>1,
+                            "state"=>$baseData['2074999790310401_2'] ?? 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"220708胶带巷",
+                    "sys_code"=>"220708jdx",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData['2046522721719297_2'] ?? 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData['2046522723800065_2'] ?? 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"110207回风巷",
+                    "sys_code"=>"110207hfx",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData['2059629794612225_2'] ?? 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData['2059629795228673_2'] ?? 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"110207机巷通风机",
+                    "sys_code"=>"110207jx",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData['2059629794612225_2'] ?? 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData['2059629795228673_2'] ?? 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"250602回风巷通风机",
+                    "sys_code"=>"250602hfx",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData['2063316486075393_2'] ?? 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData['2063316488862721_2'] ?? 0,
+                            "text"=>"运行"
+                        ]
+                    ]
+                ],
+                [
+                    "title"=>"13207机巷通风机",
+                    "sys_code"=>"13207jx",
+                    "info"=>[
+                        [
+                            "label"=>"1#风机",
+                            "state"=>$baseData['2074993339513857_2'] ?? 0,
+                            "text"=>"停止"
+                        ],
+                        [
+                            "label"=>"2#风机",
+                            "state"=>$baseData['2074993343917057_2'] ?? 0,
                             "text"=>"运行"
                         ]
                     ]
                 ]
             ]
         ];
+
         return json_encode($info);
     }
     /*

Modules/OpcData/Services/zaoquan/ZQDcsApiService.php

@@ -16,21 +16,17 @@ class ZQDcsApiService
 
 
 
-    public function getApiData($apiUrl, $queryParams)
+    public function getApiData($apiUrl, $queryParams='')
     {
         // 发送 HTTP GET 请求
         $response = $this->client->get($apiUrl, [
             'query' => $queryParams,
             // 可以添加其他选项，如 headers、auth 等
         ]);
-
         // 获取 API 响应的 JSON 数据
         $data = json_decode($response->getBody(), true);
 
-        // 对数据进行重组，这里只是一个示例，具体根据实际需求调整
-        $transformedData = $this->transformData($data);
-
-        return $transformedData;
+        return $data;
     }
 
     public function postPointRealData($apiUrl, $pointIds) {
@@ -68,6 +64,18 @@ class ZQDcsApiService
         // 发送 HTTP POST 请求
         $response = $this->client->post($apiUrl, $postData);
 
+        // 发送 HTTP POST 请求
+        $response = $this->client->post($apiUrl, [
+            'headers' => [
+                'Authorization' => 'Bearer appkey_100100',
+                'Content-Type'=>'application/json; charset=utf-8',
+                // 其他头部信息
+            ],
+            'json' =>[
+                'PageNum'=>"-1"
+            ]
+        ]);
+        return $response;
         // 获取 API 响应的 JSON 数据
         $data = json_decode($response->getBody(), true);