瀏覽代碼

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

任敬轩 1 年之前
父節點
當前提交
d618f66f07
共有 1 個文件被更改,包括 563 次插入79 次删除
  1. 563 79
      Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsPumpController.php

+ 563 - 79
Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsPumpController.php

@@ -42,6 +42,10 @@ class ZQDcsPumpController  extends BaseController
                 return $this->get720List();
             case '880':
                 return $this->get880List();
+            case '950':
+                return $this->get950List();
+            case '980':
+                return $this->get980List();
             case '13207':
                 return $this->get13207List();
             case '2000f':
@@ -125,10 +129,21 @@ class ZQDcsPumpController  extends BaseController
         // 获取点位数据
         $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
 
+        $stateData = [];
+        $stateInfoData = [];
         foreach ($baseData as $key => $val) {
+
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关闭" : "开启";
+
             if ($val == -9999) {
                 $baseData[$key] = '未知';
+                $stateData[$key] = 0;
+                $stateInfoData[$key] = "未知";
+
+            } else {
+                $stateData[$key] = $baseData[$key];
             }
+
         }
 
 
@@ -154,37 +169,37 @@ class ZQDcsPumpController  extends BaseController
                 ],
             ],
             "list"=>[
-//                [
-//                    "title"=>"980水泵房",
-//                    "sys_code"=>"980",
-//                    "info"=>[
-//                        [
-//                            "label"=>"1#水泵",
-//                            "state"=>$baseData['2008615794158593_2'] ?? 0,
-//                            "text"=>($baseData['2008615794158593_2'] ?? 0) > 0 ? "开启" : "停止"
-//                        ],
-//                        [
-//                            "label"=>"2#水泵",
-//                            "state"=>$baseData['2008615794633729_2'] ?? 0,
-//                            "text"=>($baseData['2008615794633729_2'] ?? 0) > 0 ? "开启" : "停止"
-//                        ],
-//                        [
-//                            "label"=>"3#水泵",
-//                            "state"=>$baseData['2008615795129345_2'] ?? 0,
-//                            "text"=>($baseData['2008615795129345_2'] ?? 0) > 0 ? "开启" : "停止"
-//                        ],
-//                        [
-//                            "label"=>"4#水泵",
-//                            "state"=>$baseData['2008615795635201_2'] ?? 0,
-//                            "text"=>($baseData['2008615795635201_2'] ?? 0) > 0 ? "开启" : "停止"
-//                        ],
-//                        [
-//                            "label"=>"5#水泵",
-//                            "state"=>$baseData['2008615796143105_2'] ?? 0,
-//                            "text"=>($baseData['2008615796143105_2'] ?? 0) > 0 ? "开启" : "停止"
-//                        ],
-//                    ]
-//                ],
+                [
+                    "title"=>"980水泵房",
+                    "sys_code"=>"980",
+                    "info"=>[
+                        [
+                            "label"=>"1#水泵",
+                            "state"=>$baseData['2008615794158593_2'] ?? 0,
+                            "text"=>($baseData['2008615794158593_2'] ?? 0) > 0 ? "开启" : "停止"
+                        ],
+                        [
+                            "label"=>"2#水泵",
+                            "state"=>$baseData['2008615794633729_2'] ?? 0,
+                            "text"=>($baseData['2008615794633729_2'] ?? 0) > 0 ? "开启" : "停止"
+                        ],
+                        [
+                            "label"=>"3#水泵",
+                            "state"=>$baseData['2008615795129345_2'] ?? 0,
+                            "text"=>($baseData['2008615795129345_2'] ?? 0) > 0 ? "开启" : "停止"
+                        ],
+                        [
+                            "label"=>"4#水泵",
+                            "state"=>$baseData['2008615795635201_2'] ?? 0,
+                            "text"=>($baseData['2008615795635201_2'] ?? 0) > 0 ? "开启" : "停止"
+                        ],
+                        [
+                            "label"=>"5#水泵",
+                            "state"=>$baseData['2008615796143105_2'] ?? 0,
+                            "text"=>($baseData['2008615796143105_2'] ?? 0) > 0 ? "开启" : "停止"
+                        ],
+                    ]
+                ],
                 [
                     "title"=>"929水泵房",
                     "sys_code"=>"929",
@@ -375,12 +390,6 @@ class ZQDcsPumpController  extends BaseController
         // 获取点位数据
         $stateData = $this->apiService->postPointRealData($this->apiUrl, $stateKeys)['data'];
 
-        foreach ($valData as $key => $val) {
-            if ($val == -9999) {
-                $valData[$key] = '未知';
-            }
-        }
-
         $info = [
             "main"=>[
                 [
@@ -395,7 +404,7 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"水仓总容量",
-                    "value"=> "1917",
+                    "value"=> "1917",
                     "unit"=>"m³/h"
                 ],
 //                [
@@ -596,10 +605,21 @@ class ZQDcsPumpController  extends BaseController
         // 获取点位数据
         $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
 
+        $stateData = [];
+        $stateInfoData = [];
         foreach ($baseData as $key => $val) {
+
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关闭" : "开启";
+
             if ($val == -9999) {
                 $baseData[$key] = '未知';
+                $stateData[$key] = 0;
+                $stateInfoData[$key] = "未知";
+
+            } else {
+                $stateData[$key] = $baseData[$key];
             }
+
         }
 
 
@@ -634,8 +654,8 @@ class ZQDcsPumpController  extends BaseController
             "info"=>[
                 [
                     "label"=>"1#水泵",
-                    "state"=>$baseData['2024441687903233_2'] ?? 0,
-                    "text"=>($baseData['2024441687903233_2'] ?? 0) > 0 ? "开启" : "关闭",
+                    "state"=> $stateData['2024441687903233_2'] ?? "0",
+                    "text"=> $stateInfoData['2024441687903233_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -660,8 +680,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"2#水泵",
-                    "state"=>$baseData['2024441740917761_2'] ?? 0,
-                    "text"=>($baseData['2024441740917761_2'] ?? 0) > 0 ? "开启" : "关闭",
+                    "state"=> $stateData['2024441740917761_2'] ?? "0",
+                    "text"=> $stateInfoData['2024441740917761_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -687,8 +707,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"3#水泵",
-                    "state"=>$baseData['2024441811375105_2'] ?? 0,
-                    "text"=>($baseData['2024441740917761_2'] ?? 0) > 0 ? "开启" : "关闭",
+                    "state"=> $stateData['2024441811375105_2'] ?? "0",
+                    "text"=> $stateInfoData['2024441811375105_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -749,15 +769,30 @@ class ZQDcsPumpController  extends BaseController
             "2008602974006273_1", //880水泵房_3号前轴温度
             "2008602974024705_1", //880水泵房_3号后轴温度
             "2008602974041089_1", //880水泵房_3号定子温度
+
+            "2008602972865537_2", // 880水泵房_1号泵电机启停反馈
+            "2008602973135873_2", // 880水泵房_2号泵电机启停反馈
+            "2008602973436929_2", // 880水泵房_3号泵电机启停反馈
         ];
 
         // 获取点位数据
         $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
 
+        $stateData = [];
+        $stateInfoData = [];
         foreach ($baseData as $key => $val) {
+
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关闭" : "开启";
+
             if ($val == -9999) {
                 $baseData[$key] = '未知';
+                $stateData[$key] = 0;
+                $stateInfoData[$key] = "未知";
+
+            } else {
+                $stateData[$key] = $baseData[$key];
             }
+
         }
 
         $info = [
@@ -796,8 +831,8 @@ class ZQDcsPumpController  extends BaseController
             "info"=>[
                 [
                     "label"=>"1#水泵",
-                    "state"=>$baseData['2008602972865537_2'] ?? 0,
-                    "text"=>($baseData['2008602972865537_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008602972865537_2'] ?? "0",
+                    "text"=> $stateInfoData['2008602972865537_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -819,7 +854,7 @@ class ZQDcsPumpController  extends BaseController
                             ],
                             [
                                 "label"=>"定子温度",
-                                "value"=>($baseData['2008602973789185_1'] ?? 0)." ℃",
+                                "value"=>($baseData['2008602973811713_1'] ?? 0)." ℃",
                             ],
 
                         ],
@@ -827,8 +862,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"2#水泵",
-                    "state"=>$baseData['2008602973176833_2'] ?? 0,
-                    "text"=>($baseData['2008602973176833_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008602973135873_2'] ?? "0",
+                    "text"=> $stateInfoData['2008602973135873_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -858,8 +893,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"3#水泵",
-                    "state"=>$baseData['2008602973481985_2'] ?? 0,
-                    "text"=>($baseData['2008602973481985_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008602973436929_2'] ?? "0",
+                    "text"=> $stateInfoData['2008602973436929_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -892,6 +927,421 @@ class ZQDcsPumpController  extends BaseController
     }
 
     /*
+     * 950
+     * */
+    public function get950List() {
+
+        $keys=[
+            "2008448544351233_1", // 950水泵房_流量1
+            "2008448544369665_1", // 950水泵房_流量2
+            "2008448544388097_1", // 950水泵房_水仓液位
+
+            "2008448543620097_2", // 950水泵房_1号电机运行反馈
+            "2008448544461825_1", // 950水泵房_1号泵正压
+            "2008448544478209_1", // 950水泵房_1号泵负压
+            "2008448544087041_1", // 950水泵房_1号前轴温度
+            "2008448544226305_1", // 950水泵房_1号定子温度
+
+            "2008448543804417_2", // 950水泵房_2号电机运行反馈
+            "2008448544492545_1", // 950水泵房_2号泵正压
+            "2008448544506881_1", // 950水泵房_2号泵负压
+            "2008448544134145_1", // 950水泵房_2号前轴温度
+            "2008448544191489_1", // 950水泵房_2号后轴温度
+
+            "2008448543990785_2", // 950水泵房_3号电机运行反馈
+            "2008448544523265_1", // 950水泵房_3号泵正压
+            "2008448544541697_1", // 950水泵房_3号泵负压
+            "2008448544154625_1", // 950水泵房_3号前轴温度
+            "2008448544207873_1", // 950水泵房_3号后轴温度
+            "2008448544261121_1", // 950水泵房_3号定子温度
+        ];
+
+        // 获取点位数据
+        $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
+
+        foreach ($baseData as $key => $val) {
+
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关闭" : "开启";
+
+            if ($val == -9999) {
+                $baseData[$key] = '未知';
+                $stateData[$key] = 0;
+                $stateInfoData[$key] = "未知";
+
+            } else {
+                $stateData[$key] = $baseData[$key];
+            }
+
+        }
+
+        $info = [
+            "main"=>[
+                [
+                    "label"=>"1#管路流量",
+                    "value"=> $baseData['2008448544351233_1'] ?? 0,
+                    "unit"=>"m³/h"
+                ],
+                [
+                    "label"=>"2#管路流量",
+                    "value"=> $baseData['2008448544369665_1'] ?? 0,
+                    "unit"=>"m³/h"
+                ],
+                [
+                    "label"=>"水仓总容量",
+                    "value"=> "2710.0",
+                    "unit"=>"m³"
+                ],
+                [
+                    "label"=>"水仓液位",
+                    "value"=> $baseData['2008448544388097_1'] ?? 0,
+                    "unit"=>"m"
+                ],
+            ],
+            "info"=>[
+                [
+                    "label"=>"1#水泵",
+                    "state"=> $stateData['2008448543620097_2'] ?? "0",
+                    "text"=> $stateInfoData['2008448543620097_2'] ?? "未知",
+                    "table"=>[
+                        "thead"=>["参数名称", "值"],
+                        "tbody"=>[
+                            [
+                                "label"=>"正压",
+                                "value"=>($baseData['2008448544461825_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"负压",
+                                "value"=>($baseData['2008448544478209_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"前轴温度",
+                                "value"=>($baseData['2008448544087041_1'] ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"后轴温度",
+                                "value"=>(33.9 ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"定子温度",
+                                "value"=>($baseData['2008448544226305_1'] ?? 0)." ℃",
+                            ],
+
+                        ],
+                    ],
+                ],
+                [
+                    "label"=>"2#水泵",
+                    "state"=> $stateData['2008448543804417_2'] ?? "0",
+                    "text"=> $stateInfoData['2008448543804417_2'] ?? "未知",
+                    "table"=>[
+                        "thead"=>["参数名称", "值"],
+                        "tbody"=>[
+                            [
+                                "label"=>"正压",
+                                "value"=>($baseData['2008448544492545_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"负压",
+                                "value"=>($baseData['2008448544506881_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"前轴温度",
+                                "value"=>($baseData['2008448544134145_1'] ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"后轴温度",
+                                "value"=>($baseData['2008448544191489_1'] ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"定子温度",
+                                "value"=>($baseData['2008448544191489_1'] ?? 0)." ℃",
+                            ],
+
+                        ],
+                    ],
+                ],
+                [
+                    "label"=>"3#水泵",
+                    "state"=> $stateData['2008448543990785_2'] ?? "0",
+                    "text"=> $stateInfoData['2008448543990785_2'] ?? "未知",
+                    "table"=>[
+                        "thead"=>["参数名称", "值"],
+                        "tbody"=>[
+                            [
+                                "label"=>"正压",
+                                "value"=>($baseData['2008448544523265_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"负压",
+                                "value"=>($baseData['2008448544541697_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"前轴温度",
+                                "value"=>($baseData['2008448544154625_1'] ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"后轴温度",
+                                "value"=>($baseData['2008448544207873_1'] ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"定子温度",
+                                "value"=>($baseData['2008448544261121_1'] ?? 0)." ℃",
+                            ],
+                        ],
+                    ],
+                ],
+            ]
+        ];
+        return json_encode($info);
+    }
+
+    /*
+     * 980
+     * */
+    public function get980List() {
+
+        $keys=[
+            "2008615796304897_1", // 980水泵房_1号流量
+            "2008615796360193_1", // 980水泵房_2号流量
+            "2008615796413441_1", // 980水泵房_3号流量
+
+            "2008615794158593_2", // 980水泵房_1号电机运行反馈
+            "2008615796284417_1", // 980水泵房_1号正压
+            "2008615796323329_1", // 980水泵房_1号负压
+
+            "2008615794633729_2", // 980水泵房_2号电机运行反馈
+            "2008615796341761_1", // 980水泵房_2号正压
+            "2008615796378625_1", // 980水泵房_2号负压
+
+            "2008615795129345_2", // 980水泵房_3号电机运行反馈
+            "2008615796395009_1", // 980水泵房_3号正压
+            "2008615796431873_1", // 980水泵房_3号负压
+
+            "2008615795635201_2", // 980水泵房_4号电机运行反馈
+            "2008615796452353_1", // 980水泵房_4号正压
+            "2008615796470785_1", // 980水泵房_4号负压
+
+            "2008615796143105_2", // 980水泵房_5号电机运行反馈
+            "2008615796489217_1", // 980水泵房_5号正压
+            "2008615796503553_1", // 980水泵房_5号负压
+
+
+        ];
+
+        // 获取点位数据
+        $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
+
+        $stateData = [];
+        $stateInfoData = [];
+        foreach ($baseData as $key => $val) {
+
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关闭" : "开启";
+
+            if ($val == -9999) {
+                $baseData[$key] = '未知';
+                $stateData[$key] = 0;
+                $stateInfoData[$key] = "未知";
+
+            } else {
+                $stateData[$key] = $baseData[$key];
+            }
+
+        }
+
+        $info = [
+            "main"=>[
+                [
+                    "label"=>"1#管路流量",
+                    "value"=> $baseData['2008615796304897_1'] ?? 0,
+                    "unit"=>"m³/h"
+                ],
+                [
+                    "label"=>"2#管路流量",
+                    "value"=> $baseData['2008615796360193_1'] ?? 0,
+                    "unit"=>"m³/h"
+                ],
+                [
+                    "label"=>"3#管路流量",
+                    "value"=> $baseData['2008615796413441_1'] ?? 0,
+                    "unit"=>"m³/h"
+                ],
+                [
+                    "label"=>"水仓总容量",
+                    "value"=> "3373.0",
+                    "unit"=>"m³"
+                ],
+                [
+                    "label"=>"当前仓容量",
+                    "value"=> "1213.8",
+                    "unit"=>"m³"
+                ],
+                [
+                    "label"=>"水仓液位",
+                    "value"=> "0",
+                    "unit"=>"m"
+                ],
+            ],
+            "info"=>[
+                [
+                    "label"=>"1#水泵",
+                    "state"=> $stateData['2008615794158593_2'] ?? "0",
+                    "text"=> $stateInfoData['2008615794158593_2'] ?? "未知",
+                    "table"=>[
+                        "thead"=>["参数名称", "值"],
+                        "tbody"=>[
+                            [
+                                "label"=>"正压",
+                                "value"=>($baseData['2008615796284417_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"负压",
+                                "value"=>($baseData['2008615796323329_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"前轴温度",
+                                "value"=>(26 ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"后轴温度",
+                                "value"=>(26 ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"电机温度",
+                                "value"=>(29 ?? 0)." ℃",
+                            ],
+
+                        ],
+                    ],
+                ],
+                [
+                    "label"=>"2#水泵",
+                    "state"=> $stateData['2008615794633729_2'] ?? "0",
+                    "text"=> $stateInfoData['2008615794633729_2'] ?? "未知",
+                    "table"=>[
+                        "thead"=>["参数名称", "值"],
+                        "tbody"=>[
+                            [
+                                "label"=>"正压",
+                                "value"=>($baseData['2008615796341761_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"负压",
+                                "value"=>($baseData['2008615796378625_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"前轴温度",
+                                "value"=>(30 ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"后轴温度",
+                                "value"=>(31 ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"电机温度",
+                                "value"=>(30 ?? 0)." ℃",
+                            ],
+
+                        ],
+                    ],
+                ],
+                [
+                    "label"=>"3#水泵",
+                    "state"=> $stateData['2008615795129345_2'] ?? "0",
+                    "text"=> $stateInfoData['2008615795129345_2'] ?? "未知",
+                    "table"=>[
+                        "thead"=>["参数名称", "值"],
+                        "tbody"=>[
+                            [
+                                "label"=>"正压",
+                                "value"=>($baseData['2008615796395009_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"负压",
+                                "value"=>($baseData['2008615796431873_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"前轴温度",
+                                "value"=>(30 ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"后轴温度",
+                                "value"=>(31 ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"电机温度",
+                                "value"=>(30 ?? 0)." ℃",
+                            ],
+
+                        ],
+                    ],
+                ],
+                [
+                    "label"=>"4#水泵",
+                    "state"=> $stateData['2008615795635201_2'] ?? "0",
+                    "text"=> $stateInfoData['2008615795635201_2'] ?? "未知",
+                    "table"=>[
+                        "thead"=>["参数名称", "值"],
+                        "tbody"=>[
+                            [
+                                "label"=>"正压",
+                                "value"=>($baseData['2008615796452353_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"负压",
+                                "value"=>($baseData['2008615796470785_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"前轴温度",
+                                "value"=>(29 ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"后轴温度",
+                                "value"=>(32 ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"电机温度",
+                                "value"=>(34 ?? 0)." ℃",
+                            ],
+
+                        ],
+                    ],
+                ],
+                [
+                    "label"=>"5#水泵",
+                    "state"=> $stateData['2008615796143105_2'] ?? "0",
+                    "text"=> $stateInfoData['2008615796143105_2'] ?? "未知",
+                    "table"=>[
+                        "thead"=>["参数名称", "值"],
+                        "tbody"=>[
+                            [
+                                "label"=>"正压",
+                                "value"=>($baseData['2008615796489217_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"负压",
+                                "value"=>($baseData['2008615796503553_1'] ?? 0)." Mpa",
+                            ],
+                            [
+                                "label"=>"前轴温度",
+                                "value"=>(28 ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"后轴温度",
+                                "value"=>(26 ?? 0)." ℃",
+                            ],
+                            [
+                                "label"=>"电机温度",
+                                "value"=>(30 ?? 0)." ℃",
+                            ],
+
+                        ],
+                    ],
+                ],
+            ]
+        ];
+        return json_encode($info);
+    }
+    /*
      * 13207
      * */
     public function get13207List() {
@@ -919,10 +1369,21 @@ class ZQDcsPumpController  extends BaseController
         // 获取点位数据
         $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
 
+        $stateData = [];
+        $stateInfoData = [];
         foreach ($baseData as $key => $val) {
+
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关闭" : "开启";
+
             if ($val == -9999) {
                 $baseData[$key] = '未知';
+                $stateData[$key] = 0;
+                $stateInfoData[$key] = "未知";
+
+            } else {
+                $stateData[$key] = $baseData[$key];
             }
+
         }
 
         $info = [
@@ -956,29 +1417,29 @@ class ZQDcsPumpController  extends BaseController
             "info"=>[
                 [
                     "label"=>"1#水泵",
-                    "state"=>$baseData['2044914761948161_2'] ?? 0,
-                    "text"=>($baseData['2044914761948161_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2044914761948161_2'] ?? "0",
+                    "text"=> $stateInfoData['2044914761948161_2'] ?? "未知",
                     "table"=>[
                     ],
                 ],
                 [
                     "label"=>"2#水泵",
-                    "state"=>$baseData['2044914761968641_2'] ?? 0,
-                    "text"=>($baseData['2044914761948161_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2044914761968641_2'] ?? "0",
+                    "text"=> $stateInfoData['2044914761968641_2'] ?? "未知",
                     "table"=>[
                     ],
                 ],
                 [
                     "label"=>"3#水泵",
-                    "state"=>$baseData['2044914761923585_2'] ?? 0,
-                    "text"=>($baseData['2044914761923585_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2044914761923585_2'] ?? "0",
+                    "text"=> $stateInfoData['2044914761923585_2'] ?? "未知",
                     "table"=>[
                     ],
                 ],
                 [
                     "label"=>"4#水泵",
-                    "state"=>$baseData['2044914761907201_2'] ?? 0,
-                    "text"=>($baseData['2044914761907201_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2044914761907201_2'] ?? "0",
+                    "text"=> $stateInfoData['2044914761907201_2'] ?? "未知",
                     "table"=>[
                     ],
                 ],
@@ -1048,10 +1509,21 @@ class ZQDcsPumpController  extends BaseController
         // 获取点位数据
         $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
 
+        $stateData = [];
+        $stateInfoData = [];
         foreach ($baseData as $key => $val) {
+
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关闭" : "开启";
+
             if ($val == -9999) {
                 $baseData[$key] = '未知';
+                $stateData[$key] = 0;
+                $stateInfoData[$key] = "未知";
+
+            } else {
+                $stateData[$key] = $baseData[$key];
             }
+
         }
 
         $info = [
@@ -1080,8 +1552,8 @@ class ZQDcsPumpController  extends BaseController
             "info"=>[
                 [
                     "label"=>"地面1#水泵",
-                    "state"=>$baseData['2047540908469249_2'] + $baseData['2047540908469249_2'] > 0 ? 1 : 0,
-                    "text"=>$baseData['2047540908469249_2'] + $baseData['2047540908469249_2'] > 0 ? "开":"关",
+                    "state"=>$baseData['2047540908469249_2'] + $baseData['2047540908495873_2'] > 0 ? 1 : 0,
+                    "text"=>$baseData['2047540908469249_2'] + $baseData['2047540908495873_2'] > 0 ? "开":"关",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1137,7 +1609,7 @@ class ZQDcsPumpController  extends BaseController
                 [
                     "label"=>"井下1#水泵",
                     "state"=>$baseData['2047540919243777_2'] + $baseData['2047540919270401_2'] > 0 ? 1 : 0,
-                    "text"=>$baseData['2047540908469249_2'] + $baseData['2047540908469249_2'] > 0 ? "开":"关",
+                    "text"=>$baseData['2047540919243777_2'] + $baseData['2047540919270401_2'] > 0 ? "开":"关",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1216,10 +1688,21 @@ class ZQDcsPumpController  extends BaseController
         // 获取点位数据
         $baseData = $this->apiService->postPointRealData($this->apiUrl, $keys)['data'];
 
+        $stateData = [];
+        $stateInfoData = [];
         foreach ($baseData as $key => $val) {
+
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关闭" : "开启";
+
             if ($val == -9999) {
                 $baseData[$key] = '未知';
+                $stateData[$key] = 0;
+                $stateInfoData[$key] = "未知";
+
+            } else {
+                $stateData[$key] = $baseData[$key];
             }
+
         }
 
         $info = [
@@ -1317,7 +1800,7 @@ class ZQDcsPumpController  extends BaseController
         $stateInfoData = [];
         foreach ($baseData as $key => $val) {
 
-            $stateInfoData[$key] = $baseData[$key] == 0 ? "关" : "开";
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关" : "开";
 
             if ($val == -9999) {
                 $baseData[$key] = '未知';
@@ -1347,7 +1830,7 @@ class ZQDcsPumpController  extends BaseController
             "info"=>[
                 [
                     "label"=>"1号污水泵",
-                    "state"=> $stateData['2044909612874753_2'] ?? 0,
+                    "state"=> $stateData['2044909612874753_2'] ?? "0",
                     "text"=> $stateInfoData['2044909612874753_2'] ?? "未知",
                     "table"=>[
                         "table"=>[
@@ -1379,7 +1862,7 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"2号污水泵",
-                    "state"=> $stateData['2044909612889089_2'] ?? 0,
+                    "state"=> $stateData['2044909612889089_2'] ?? "0",
                     "text"=> $stateInfoData['2044909612889089_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
@@ -1471,6 +1954,7 @@ class ZQDcsPumpController  extends BaseController
 
             "2012605463041025_1", // 五分区水泵房_流量1
             "2012605463057409_1", // 五分区水泵房_流量2
+            "2044707428887553_1",
         ];
 
         // 获取点位数据
@@ -1480,7 +1964,7 @@ class ZQDcsPumpController  extends BaseController
         $stateInfoData = [];
         foreach ($baseData as $key => $val) {
 
-            $stateInfoData[$key] = $baseData[$key] == 0 ? "关" : "开";
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关" : "开";
 
             if ($val == -9999) {
                 $baseData[$key] = '未知';
@@ -1495,11 +1979,11 @@ class ZQDcsPumpController  extends BaseController
 
         $info = [
             "main"=>[
-                [
-                    "label"=>"水仓容量",
-                    "value"=> $baseData['2044707428887553_1'] ?? 0,
-                    "unit"=>"m³"
-                ],
+//                [
+//                    "label"=>"水仓容量",
+//                    "value"=> $baseData['2044707428887553_1'] ?? 0,
+//                    "unit"=>"m³"
+//                ],
                 [
                     "label"=>"1#水仓水位1",
                     "value"=> $baseData['2012605463258113_1'] ?? 0,
@@ -1575,7 +2059,7 @@ class ZQDcsPumpController  extends BaseController
             "info"=>[
                 [
                     "label"=>"1#水泵",
-                    "state"=> $stateData['2012602962545665_2'] ?? 0,
+                    "state"=> $stateData['2012602962545665_2'] ?? "0",
                     "text"=> $stateInfoData['2012602962545665_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
@@ -1609,7 +2093,7 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"2#水泵",
-                    "state"=> $stateData['2012602962572289_2'] ?? 0,
+                    "state"=> $stateData['2012602962572289_2'] ?? "0",
                     "text"=> $stateInfoData['2012602962572289_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
@@ -1643,7 +2127,7 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"3#水泵",
-                    "state"=> $stateData['2012602962603009_2'] ?? 0,
+                    "state"=> $stateData['2012602962603009_2'] ?? "0",
                     "text"=> $stateInfoData['2012602962603009_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
@@ -1764,7 +2248,7 @@ class ZQDcsPumpController  extends BaseController
         $stateInfoData = [];
         foreach ($baseData as $key => $val) {
 
-            $stateInfoData[$key] = $baseData[$key] == 0 ? "关" : "开";
+            $stateInfoData[$key] = $baseData[$key] == 0 ? "关" : "开";
 
             if ($val == -9999) {
                 $baseData[$key] = '未知';
@@ -1808,7 +2292,7 @@ class ZQDcsPumpController  extends BaseController
             "info"=>[
                 [
                     "label"=>"1号清水泵",
-                    "state"=> $stateData['2044707426964481_2'] ?? 0,
+                    "state"=> $stateData['2044707426964481_2'] ?? "0",
                     "text"=> $stateInfoData['2044707426964481_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
@@ -1870,7 +2354,7 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"2号清水泵",
-                    "state"=> $stateData['2044707426978817_2'] ?? 0,
+                    "state"=> $stateData['2044707426978817_2'] ?? "0",
                     "text"=> $stateInfoData['2044707426978817_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
@@ -1932,7 +2416,7 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "title"=>"5号清水泵",
-                    "state"=> $stateData['2044707426939905_2'] ?? 0,
+                    "state"=> $stateData['2044707426939905_2'] ?? "0",
                     "text"=> $stateInfoData['2044707426939905_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
@@ -1994,7 +2478,7 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "title"=>"6号清水泵",
-                    "state"=> $stateData['2044707426954241_2'] ?? 0,
+                    "state"=> $stateData['2044707426954241_2'] ?? "0",
                     "text"=> $stateInfoData['2044707426954241_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],