通风点位错误修改

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

@@ -526,7 +526,7 @@ class ZQDcsFanController  extends BaseController
         $baseData = $dataFromGetRequest["data"];
 
         // 工作方式
-        $workMode = [[],[]];
+        $workMode = ["",""];
         if ($baseData["2074993340834817_2"] == 1) {
             $workMode[0] = "对旋1";
         } else if ($baseData["2074993340867585_2"] == 1) {
@@ -543,7 +543,7 @@ class ZQDcsFanController  extends BaseController
             $workMode[1] = "对旋3";
         }
 
-        $ctrlMode = [[],[]];
+        $ctrlMode = ["",""];
         if ($baseData["2074993341709313_2"] == 1) {
             $ctrlMode[0] = "近控";
         } else if ($baseData["2074993341793281_2"] == 1) {
@@ -560,7 +560,7 @@ class ZQDcsFanController  extends BaseController
             $ctrlMode[1] = "远控";
         }
 
-        $fault = [[],[]];
+        $fault = ["",""];
         if ($baseData["2074993339606017_2"] == 0) {
             $fault[0] = "前级故障";
         }
@@ -576,7 +576,7 @@ class ZQDcsFanController  extends BaseController
         if ($baseData["2074993344912385_2"] == 0) {
             $fault[1] = "后级故障";
         }
-        if (empty($fault[0])) {
+        if (empty($fault[1])) {
             $fault[1] = "无故障";
         }
 
@@ -667,8 +667,8 @@ class ZQDcsFanController  extends BaseController
                 ],
                 [
                     "label"=>"主备选择",
-                    "value_1"=>$baseData["2074993338950657_2"] == 1 ? "主机" : "备机",
-                    "value_2"=>$baseData["2074993343380481_2"] == 1 ? "主机" : "备机",
+                    "value_1"=>$baseData["2074993338950657_2"] == 0 ? "主机" : "备机",
+                    "value_2"=>$baseData["2074993343380481_2"] == 0 ? "主机" : "备机",
                 ]
             ]
         ];
@@ -752,7 +752,7 @@ class ZQDcsFanController  extends BaseController
         $baseData = $dataFromGetRequest["data"];
 
         // 工作方式
-        $workMode = [[],[]];
+        $workMode = ["",""];
         if ($baseData["2063316487095297_2"] == 1) {
             $workMode[0] = "对旋1";
         } else if ($baseData["2063316487130113_2"] == 1) {
@@ -769,7 +769,7 @@ class ZQDcsFanController  extends BaseController
             $workMode[1] = "对旋3";
         }
 
-        $ctrlMode = [[],[]];
+        $ctrlMode = ["",""];
         if ($baseData["2063316487590913_2"] == 1) {
             $ctrlMode[0] = "近控";
         } else if ($baseData["2063316487648257_2"] == 1) {
@@ -786,7 +786,7 @@ class ZQDcsFanController  extends BaseController
             $ctrlMode[1] = "远控";
         }
 
-        $fault = [[],[]];
+        $fault = ["",""];
         if ($baseData["2063316486167553_2"] == 0) {
             $fault[0] = "前级故障";
         }
@@ -802,7 +802,7 @@ class ZQDcsFanController  extends BaseController
         if ($baseData["2063316489706497_2"] == 0) {
             $fault[1] = "后级故障";
         }
-        if (empty($fault[0])) {
+        if (empty($fault[1])) {
             $fault[1] = "无故障";
         }
 
@@ -893,8 +893,8 @@ class ZQDcsFanController  extends BaseController
                 ],
                 [
                     "label"=>"主备选择",
-                    "value_1"=>$baseData["2063316485768193_2"] == 1 ? "主机" : "备机",
-                    "value_2"=>$baseData["2063316488530945_2"] == 1 ? "主机" : "备机",
+                    "value_1"=>$baseData["2063316485768193_2"] == 0 ? "主机" : "备机",
+                    "value_2"=>$baseData["2063316488530945_2"] == 0 ? "主机" : "备机",
                 ]
             ]
         ];
@@ -1108,7 +1108,7 @@ class ZQDcsFanController  extends BaseController
         $baseData = $dataFromGetRequest["data"];
 
         // 工作方式
-        $workMode = [[],[]];
+        $workMode = ["",""];
         if ($baseData["2074957338092545_2"] == 1) {
             $workMode[0] = "对旋1";
         } else if ($baseData["2074957338123265_2"] == 1) {
@@ -1125,7 +1125,7 @@ class ZQDcsFanController  extends BaseController
             $workMode[1] = "对旋3";
         }
 
-        $ctrlMode = [[],[]];
+        $ctrlMode = ["",""];
         if ($baseData["2074957338598401_2"] == 1) {
             $ctrlMode[0] = "近控";
         } else if ($baseData["2074957338668033_2"] == 1) {
@@ -1142,7 +1142,7 @@ class ZQDcsFanController  extends BaseController
             $ctrlMode[1] = "远控";
         }
 
-        $fault = [[],[]];
+        $fault = ["",""];
         if ($baseData["2074957336919041_2"] == 0) {
             $fault[0] = "前级故障";
         }
@@ -1158,7 +1158,7 @@ class ZQDcsFanController  extends BaseController
         if ($baseData["2074957341361153_2"] == 0) {
             $fault[1] = "后级故障";
         }
-        if (empty($fault[0])) {
+        if (empty($fault[1])) {
             $fault[1] = "无故障";
         }
 
@@ -1249,8 +1249,8 @@ class ZQDcsFanController  extends BaseController
                 ],
                 [
                     "label"=>"主备选择",
-                    "value_1"=>$baseData["2074957336370177_2"] == 1 ? "主机" : "备机",
-                    "value_2"=>$baseData["2074957339655169_2"] == 1 ? "主机" : "备机",
+                    "value_1"=>$baseData["2074957336370177_2"] == 0 ? "主机" : "备机",
+                    "value_2"=>$baseData["2074957339655169_2"] == 0 ? "主机" : "备机",
                 ]
             ]
         ];
@@ -1333,7 +1333,7 @@ class ZQDcsFanController  extends BaseController
         $baseData = $dataFromGetRequest["data"];
 
         // 工作方式
-        $workMode = [[],[]];
+        $workMode = ["",""];
         if ($baseData["2046522722565121_2"] == 1) {
             $workMode[0] = "对旋1";
         } else if ($baseData["2046522722589697_2"] == 1) {
@@ -1350,7 +1350,7 @@ class ZQDcsFanController  extends BaseController
             $workMode[1] = "对旋3";
         }
 
-        $ctrlMode = [[],[]];
+        $ctrlMode = ["",""];
         if ($baseData["2046522725059585_2"] == 1) {
             $ctrlMode[0] = "近控";
         } else if ($baseData["2046522725110785_2"] == 1) {
@@ -1367,7 +1367,7 @@ class ZQDcsFanController  extends BaseController
             $ctrlMode[1] = "远控";
         }
 
-        $fault = [[],[]];
+        $fault = ["",""];
         if ($baseData["2046522721793025_2"] == 0) {
             $fault[0] = "前级故障";
         }
@@ -1383,7 +1383,7 @@ class ZQDcsFanController  extends BaseController
         if ($baseData["2046522724447233_2"] == 0) {
             $fault[1] = "后级故障";
         }
-        if (empty($fault[0])) {
+        if (empty($fault[1])) {
             $fault[1] = "无故障";
         }
 
@@ -1474,8 +1474,8 @@ class ZQDcsFanController  extends BaseController
                 ],
                 [
                     "label"=>"主备选择",
-                    "value_1"=>$baseData["2046522721430529_2"] == 1 ? "主机" : "备机",
-                    "value_2"=>$baseData["2046522723517441_2"] == 1 ? "主机" : "备机",
+                    "value_1"=>$baseData["2046522721430529_2"] == 0 ? "主机" : "备机",
+                    "value_2"=>$baseData["2046522723517441_2"] == 0 ? "主机" : "备机",
                 ]
             ]
         ];
@@ -1559,7 +1559,7 @@ class ZQDcsFanController  extends BaseController
         $baseData = $dataFromGetRequest["data"];
 
         // 工作方式
-        $workMode = [[],[]];
+        $workMode = ["",""];
         if ($baseData["2074999788104705_2"] == 1) {
             $workMode[0] = "对旋1";
         } else if ($baseData["2074999788137473_2"] == 1) {
@@ -1576,7 +1576,7 @@ class ZQDcsFanController  extends BaseController
             $workMode[1] = "对旋3";
         }
 
-        $ctrlMode = [[],[]];
+        $ctrlMode = ["",""];
         if ($baseData["2074999788717057_2"] == 1) {
             $ctrlMode[0] = "近控";
         } else if ($baseData["2074999788788737_2"] == 1) {
@@ -1593,7 +1593,7 @@ class ZQDcsFanController  extends BaseController
             $ctrlMode[1] = "远控";
         }
 
-        $fault = [[],[]];
+        $fault = ["",""];
         if ($baseData["2074999786685441_2"] == 0) {
             $fault[0] = "前级故障";
         }
@@ -1609,7 +1609,7 @@ class ZQDcsFanController  extends BaseController
         if ($baseData["2074999790408705_2"] == 0) {
             $fault[1] = "后级故障";
         }
-        if (empty($fault[0])) {
+        if (empty($fault[1])) {
             $fault[1] = "无故障";
         }
 
@@ -1700,8 +1700,8 @@ class ZQDcsFanController  extends BaseController
                 ],
                 [
                     "label"=>"主备选择",
-                    "value_1"=>$baseData["2074999786189825_2"] == 1 ? "主机" : "备机",
-                    "value_2"=>$baseData["2074999789917185_2"] == 1 ? "主机" : "备机",
+                    "value_1"=>$baseData["2074999786189825_2"] == 0 ? "主机" : "备机",
+                    "value_2"=>$baseData["2074999789917185_2"] == 0 ? "主机" : "备机",
                 ]
             ]
         ];
@@ -1785,7 +1785,7 @@ class ZQDcsFanController  extends BaseController
         $baseData = $dataFromGetRequest["data"];
 
         // 工作方式
-        $workMode = [[],[]];
+        $workMode = ["",""];
         if ($baseData["2046535460068353_2"] == 1) {
             $workMode[0] = "对旋1";
         } else if ($baseData["2046535460099073_2"] == 1) {
@@ -1802,7 +1802,7 @@ class ZQDcsFanController  extends BaseController
             $workMode[1] = "对旋3";
         }
 
-        $ctrlMode = [[],[]];
+        $ctrlMode = ["",""];
         if ($baseData["2046535460506625_2"] == 1) {
             $ctrlMode[0] = "近控";
         } else if ($baseData["2046535460574209_2"] == 1) {
@@ -1819,7 +1819,7 @@ class ZQDcsFanController  extends BaseController
             $ctrlMode[1] = "远控";
         }
 
-        $fault = [[],[]];
+        $fault = ["",""];
         if ($baseData["2046535459806209_2"] == 0) {
             $fault[0] = "前级故障";
         }
@@ -1835,7 +1835,7 @@ class ZQDcsFanController  extends BaseController
         if ($baseData["2046535461415937_2"] == 0) {
             $fault[1] = "后级故障";
         }
-        if (empty($fault[0])) {
+        if (empty($fault[1])) {
             $fault[1] = "无故障";
         }
 
@@ -1890,7 +1890,7 @@ class ZQDcsFanController  extends BaseController
                     "value_2"=>$baseData["2046535463814145_1"] ?? 0,
                 ],
                 [
-                    "label"=>"电压（V）",
+                    "label"=>"风机电压（V）",
                     "value_1"=>$baseData["2046535463582721_1"] ?? 0,
                     "value_2"=>$baseData["2046535463857153_1"] ?? 0,
                 ],
@@ -1926,8 +1926,8 @@ class ZQDcsFanController  extends BaseController
                 ],
                 [
                     "label"=>"主备选择",
-                    "value_1"=>$baseData["2046535458790401_2"] == 1 ? "主机" : "备机",
-                    "value_2"=>$baseData["2046535461028865_2"] == 1 ? "主机" : "备机",
+                    "value_1"=>$baseData["2046535458790401_2"] == 1 ? "备机" : "主机",
+                    "value_2"=>$baseData["2046535461028865_2"] == 1 ? "备机" : "主机",
                 ]
             ]
         ];
@@ -1980,6 +1980,13 @@ class ZQDcsFanController  extends BaseController
             "2049479006893057_2", // 副机近控
             "2049479006946305_2", // 副机遥控
             "2049479006919681_2", // 副机远控
+
+            "2049479004519425_2", // 主机前级无故障
+            "2049479004879873_2", // 主机后级无故障
+
+            "2049479005246465_2", // 副机前级无故障
+            "2049479006247937_2", // 副机后级无故障
+
         ];
 
         $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
@@ -1992,7 +1999,7 @@ class ZQDcsFanController  extends BaseController
         $baseData = $dataFromGetRequest["data"];
 
         // 工作方式
-        $workMode = [[],[]];
+        $workMode = ["",""];
         if ($baseData["2049479006569473_2"] == 1) {
             $workMode[0] = "对旋1";
         } else if ($baseData["2049479006598145_2"] == 1) {
@@ -2009,7 +2016,7 @@ class ZQDcsFanController  extends BaseController
             $workMode[1] = "对旋3";
         }
 
-        $ctrlMode = [[],[]];
+        $ctrlMode = ["",""];
         if ($baseData["2049479006815233_2"] == 1) {
             $ctrlMode[0] = "近控";
         } else if ($baseData["2049479006866433_2"] == 1) {
@@ -2026,7 +2033,7 @@ class ZQDcsFanController  extends BaseController
             $ctrlMode[1] = "远控";
         }
 
-        $fault = [[],[]];
+        $fault = ["",""];
         if ($baseData["2049479004519425_2"] == 0) {
             $fault[0] = "前级故障";
         }
@@ -2042,7 +2049,7 @@ class ZQDcsFanController  extends BaseController
         if ($baseData["2049479006247937_2"] == 0) {
             $fault[1] = "后级故障";
         }
-        if (empty($fault[0])) {
+        if (empty($fault[1])) {
             $fault[1] = "无故障";
         }
 
@@ -2223,7 +2230,7 @@ class ZQDcsFanController  extends BaseController
         $baseData = $dataFromGetRequest["data"];
 
         // 工作方式
-        $workMode = [[],[]];
+        $workMode = ["",""];
         if ($baseData["2049479115654145_2"] == 1) {
             $workMode[0] = "对旋1";
         } else if ($baseData["2049479115678721_2"] == 1) {
@@ -2240,7 +2247,7 @@ class ZQDcsFanController  extends BaseController
             $workMode[1] = "对旋3";
         }
 
-        $ctrlMode = [[],[]];
+        $ctrlMode = ["",""];
         if ($baseData["2049479116092417_2"] == 1) {
             $ctrlMode[0] = "近控";
         } else if ($baseData["2049479116143617_2"] == 1) {
@@ -2257,7 +2264,7 @@ class ZQDcsFanController  extends BaseController
             $ctrlMode[1] = "远控";
         }
 
-        $fault = [[],[]];
+        $fault = ["",""];
         if ($baseData["2049479114828801_2"] == 0) {
             $fault[0] = "前级故障";
         }
@@ -2273,7 +2280,7 @@ class ZQDcsFanController  extends BaseController
         if ($baseData["2049479117919233_2"] == 0) {
             $fault[1] = "后级故障";
         }
-        if (empty($fault[0])) {
+        if (empty($fault[1])) {
             $fault[1] = "无故障";
         }