水泵房点位调整

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

@@ -129,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];
             }
+
         }
 
 
@@ -379,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"=>[
                 [
@@ -600,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];
             }
+
         }
 
 
@@ -638,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"=>[
@@ -664,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"=>[
@@ -691,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"=>[
@@ -762,10 +778,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 = [
@@ -804,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"=>[
@@ -835,8 +862,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"2#水泵",
-                    "state"=>$baseData['2008602973135873_2'] ?? 0,
-                    "text"=>($baseData['2008602973135873_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008602973135873_2'] ?? "0",
+                    "text"=> $stateInfoData['2008602973135873_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -866,8 +893,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"3#水泵",
-                    "state"=>$baseData['2008602973436929_2'] ?? 0,
-                    "text"=>($baseData['2008602973436929_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008602973436929_2'] ?? "0",
+                    "text"=> $stateInfoData['2008602973436929_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -933,9 +960,18 @@ class ZQDcsPumpController  extends BaseController
         $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 = [
@@ -964,8 +1000,8 @@ class ZQDcsPumpController  extends BaseController
             "info"=>[
                 [
                     "label"=>"1#水泵",
-                    "state"=>$baseData['2008448543620097_2'] ?? 0,
-                    "text"=>($baseData['2008448543620097_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008448543620097_2'] ?? "0",
+                    "text"=> $stateInfoData['2008448543620097_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -995,8 +1031,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"2#水泵",
-                    "state"=>$baseData['2008448543804417_2'] ?? 0,
-                    "text"=>($baseData['2008448543804417_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008448543804417_2'] ?? "0",
+                    "text"=> $stateInfoData['2008448543804417_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1026,8 +1062,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"3#水泵",
-                    "state"=>$baseData['2008448543990785_2'] ?? 0,
-                    "text"=>($baseData['2008448543990785_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008448543990785_2'] ?? "0",
+                    "text"=> $stateInfoData['2008448543990785_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1095,10 +1131,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 = [
@@ -1137,8 +1184,8 @@ class ZQDcsPumpController  extends BaseController
             "info"=>[
                 [
                     "label"=>"1#水泵",
-                    "state"=>$baseData['2008615794158593_2'] ?? 0,
-                    "text"=>($baseData['2008615794158593_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008615794158593_2'] ?? "0",
+                    "text"=> $stateInfoData['2008615794158593_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1168,8 +1215,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"2#水泵",
-                    "state"=>$baseData['2008615794633729_2'] ?? 0,
-                    "text"=>($baseData['2008615794633729_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008615794633729_2'] ?? "0",
+                    "text"=> $stateInfoData['2008615794633729_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1199,8 +1246,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"3#水泵",
-                    "state"=>$baseData['2008615795129345_2'] ?? 0,
-                    "text"=>($baseData['2008615795129345_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008615795129345_2'] ?? "0",
+                    "text"=> $stateInfoData['2008615795129345_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1230,8 +1277,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"4#水泵",
-                    "state"=>$baseData['2008615795635201_2'] ?? 0,
-                    "text"=>($baseData['2008615795635201_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008615795635201_2'] ?? "0",
+                    "text"=> $stateInfoData['2008615795635201_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1261,8 +1308,8 @@ class ZQDcsPumpController  extends BaseController
                 ],
                 [
                     "label"=>"5#水泵",
-                    "state"=>$baseData['2008615796143105_2'] ?? 0,
-                    "text"=>($baseData['2008615796143105_2'] ?? 0) > 0 ? "开启" : "关闭" ,
+                    "state"=> $stateData['2008615796143105_2'] ?? "0",
+                    "text"=> $stateInfoData['2008615796143105_2'] ?? "未知",
                     "table"=>[
                         "thead"=>["参数名称", "值"],
                         "tbody"=>[
@@ -1322,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 = [
@@ -1359,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"=>[
                     ],
                 ],
@@ -1451,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 = [
@@ -1619,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 = [
@@ -1720,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] = '未知';
@@ -1750,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"=>[
@@ -1782,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"=>["参数名称", "值"],
@@ -1884,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] = '未知';
@@ -1979,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"=>["参数名称", "值"],
@@ -2013,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"=>["参数名称", "值"],
@@ -2047,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"=>["参数名称", "值"],
@@ -2168,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] = '未知';
@@ -2212,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"=>["参数名称", "值"],
@@ -2274,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"=>["参数名称", "值"],
@@ -2336,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"=>["参数名称", "值"],
@@ -2398,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"=>["参数名称", "值"],