直接请求接口

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

@@ -71,39 +71,45 @@ class ZQDcsFanController  extends BaseController
             "2046522726624257_1"
         ];
 
-        $tbName = 'dcs_data_ventilation_220708jdx';
-        $baseData = $this->getBaseDataArr($tbName, $keys);
+        $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
+
+        if($dataFromGetRequest['data'] == 0) {
+            $msg = $dataFromGetRequest['Message'];
+            return $this->error(-1, $msg);
+        }
+
+        $baseData = $dataFromGetRequest['data'];
 
         $data['tab']=[
             [
                 'title'=>"主风机",
-                'state'=> $baseData['2046522721719297_2'] ?? 0,
+                'state'=> $baseData['2046522721719297_2'] ? $baseData['2046522721719297_2'] : 0,
                 'list'=>[
                     [
                         'label'=>'1号电机',
                         "unit"=>"",
-                        "num"=> $baseData['2046522721719297_2'] ?? 0,
+                        "num"=> $baseData['2046522721719297_2'] ? $baseData['2046522721719297_2'] : 0,
                     ],
                     [
                         "label"=>"2号电机",
                         "unit"=>"",
-                        "num"=> $baseData['2046522722276353_2'] ?? 0,
+                        "num"=> $baseData['2046522722276353_2'] ? $baseData['2046522722276353_2'] : 0,
                     ],
                 ]
             ],
             [
                 'title'=>"副风机",
-                'state'=>isset($baseData['2046522723800065_2']) ?? 0,
+                'state'=>isset($baseData['2046522723800065_2']) ? $baseData['2046522723800065_2'] : 0,
                 'list'=>[
                     [
                         'label'=>'1号电机',
                         "unit"=>"",
-                        "num"=>isset($baseData['2046522723800065_2']) ?? 0,
+                        "num"=>isset($baseData['2046522723800065_2']) ? $baseData['2046522723800065_2'] : 0,
                     ],
                     [
                         "label"=>"2号电机",
                         "unit"=>"",
-                        "num"=>isset($baseData['2046522724375553_2']) ?? 0,
+                        "num"=>isset($baseData['2046522724375553_2']) ? $baseData['2046522724375553_2'] : 0,
                     ],
                 ]
             ]
@@ -116,48 +122,48 @@ class ZQDcsFanController  extends BaseController
             "tbody"=>[
                 [
                     "label"=>"Ia1电流（A）",
-                    'value_1'=>isset($baseData['2046522726140929_1']) ?? 0,
-                    'value_2'=>isset($baseData['2046522726851585_1']) ?? 0,
+                    'value_1'=>isset($baseData['2046522726140929_1']) ? $baseData['2046522726140929_1'] : 0,
+                    'value_2'=>isset($baseData['2046522726851585_1']) ? $baseData['2046522726851585_1'] : 0,
                 ],
                 [
                     "label"=>"Ib1电流（A）",
-                    'value_1'=>isset($baseData['2046522726222849_1']) ?? 0,
-                    'value_2'=>isset($baseData['2046522726927361_1']) ?? 0,
+                    'value_1'=>isset($baseData['2046522726222849_1']) ? $baseData['2046522726222849_1'] : 0,
+                    'value_2'=>isset($baseData['2046522726927361_1']) ? $baseData['2046522726927361_1'] : 0,
                 ],
                 [
                     "label"=>"Ic1电流（A）",
-                    'value_1'=>isset($baseData['2046522726312961_1']) ?? 0,
-                    'value_2'=>isset($baseData['2046522726999041_1']) ?? 0,
+                    'value_1'=>isset($baseData['2046522726312961_1']) ? $baseData['2046522726312961_1'] : 0,
+                    'value_2'=>isset($baseData['2046522726999041_1']) ? $baseData['2046522726999041_1'] : 0,
                 ],
                 [
                     "label"=>"Ia2电流（A）",
-                    'value_1'=>isset($baseData['2046522726181889_1']) ?? 0,
-                    'value_2'=>isset($baseData['2046522726888449_1']) ?? 0,
+                    'value_1'=>isset($baseData['2046522726181889_1']) ? $baseData['2046522726181889_1'] : 0,
+                    'value_2'=>isset($baseData['2046522726888449_1']) ? $baseData['2046522726888449_1'] : 0,
                 ],
                 [
                     "label"=>"Ib2电流（A）",
-                    'value_1'=>isset($baseData['2046522726267905_1']) ?? 0,
-                    'value_2'=>isset($baseData['2046522726962177_1']) ?? 0,
+                    'value_1'=>isset($baseData['2046522726267905_1']) ? $baseData['2046522726267905_1'] : 0,
+                    'value_2'=>isset($baseData['2046522726962177_1']) ? $baseData['2046522726962177_1'] : 0,
                 ],
                 [
                     "label"=>"Ic2电流（A）",
-                    'value_1'=>isset($baseData['2046522726351873_1']) ?? 0,
-                    'value_2'=>isset($baseData['2046522727037953_1']) ?? 0,
+                    'value_1'=>isset($baseData['2046522726351873_1']) ? $baseData['2046522726351873_1'] : 0,
+                    'value_2'=>isset($baseData['2046522727037953_1']) ? $baseData['2046522727037953_1'] : 0,
                 ],
                 [
                     "label"=>"风机电压（V）",
-                    'value_1'=>isset($baseData['2046522726392833_1']) ?? 0,
-                    'value_2'=>isset($baseData['2046522727113729_1']) ?? 0,
+                    'value_1'=>isset($baseData['2046522726392833_1']) ? $baseData['2046522726392833_1'] : 0,
+                    'value_2'=>isset($baseData['2046522727113729_1']) ? $baseData['2046522727113729_1'] : 0,
                 ],
                 [
                     "label"=>"1号断定值（倍）",
-                    'value_1'=>isset($baseData['2046522725757953_1']) ?? 0,
-                    'value_2'=>isset($baseData['2046522726511617_1']) ?? 0,
+                    'value_1'=>isset($baseData['2046522725757953_1']) ? $baseData['2046522725757953_1'] : 0,
+                    'value_2'=>isset($baseData['2046522726511617_1']) ? $baseData['2046522726511617_1'] : 0,
                 ],
                 [
                     "label"=>"2号断定值（倍）",
-                    'value_1'=>isset($baseData['2046522725884929_1']) ?? 0,
-                    'value_2'=>isset($baseData['2046522726624257_1']) ?? 0,
+                    'value_1'=>isset($baseData['2046522725884929_1']) ? $baseData['2046522725884929_1'] : 0,
+                    'value_2'=>isset($baseData['2046522726624257_1']) ? $baseData['2046522726624257_1'] : 0,
                 ]
             ]
         ];
@@ -179,8 +185,14 @@ class ZQDcsFanController  extends BaseController
             "2046535464545281_1"
         ];
 
-        $tbName = 'dcs_data_ventilation_220708fzx';
-        $baseData = $this->getBaseDataArr($tbName, $keys);
+        $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
+
+        if($dataFromGetRequest['data'] == 0) {
+            $msg = $dataFromGetRequest['Message'];
+            return $this->error(-1, $msg);
+        }
+
+        $baseData = $dataFromGetRequest['data'];
 
         $data['tab']=[
             [
@@ -288,8 +300,14 @@ class ZQDcsFanController  extends BaseController
             "2049479119997953_1"
         ];
 
-        $tbName = 'dcs_data_ventilation_1200sm';
-        $baseData = $this->getBaseDataArr($tbName, $keys);
+        $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
+
+        if($dataFromGetRequest['data'] == 0) {
+            $msg = $dataFromGetRequest['Message'];
+            return $this->error(-1, $msg);
+        }
+
+        $baseData = $dataFromGetRequest['data'];
 
         $data['tab']=[
             [
@@ -393,8 +411,14 @@ class ZQDcsFanController  extends BaseController
             "2049479010722817_1", "2049479011576833_1"
         ];
 
-        $tbName = 'dcs_data_ventilation_1200carpark';
-        $baseData = $this->getBaseDataArr($tbName, $keys);
+        $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
+
+        if($dataFromGetRequest['data'] == 0) {
+            $msg = $dataFromGetRequest['Message'];
+            return $this->error(-1, $msg);
+        }
+
+        $baseData = $dataFromGetRequest['data'];
 
         $data['tab']=[
             [
@@ -471,19 +495,14 @@ class ZQDcsFanController  extends BaseController
             "2009721049283585_1", "2009721049318401_1"
         ];
 
-        $tbName = 'dcs_data_ventilation_1314';
-        $baseData = $this->getBaseDataArr($tbName, $keys);
-//        $inCondition = "'" . implode("','", $east_key) . "'";
-//        // 构建 SQL 查询
-//        $sqlStr = "select `point_id`, value from dcs_data_ventilation_1314 where `point_id` in ($inCondition)";
-//
-//        $res = $this->executeSql($sqlStr, 1);
-//        $baseData=[];
-//        for ($i = 0; $i < count($res); $i++) {
-//            $key=$res[$i]->point_id;
-//            $val=$res[$i]->value;
-//            $baseData[$key]=$val;
-//        }
+        $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
+
+        if($dataFromGetRequest['data'] == 0) {
+            $msg = $dataFromGetRequest['Message'];
+            return $this->error(-1, $msg);
+        }
+
+        $baseData = $dataFromGetRequest['data'];
 
         $data['tab']=[
             [
@@ -690,20 +709,14 @@ class ZQDcsFanController  extends BaseController
             '2009735057546241_1'
         ];
 
-//        $inCondition = "'" . implode("','", $east_key) . "'";
-//        // 构建 SQL 查询
-//        $sqlStr = "select `point_id`, value from dcs_data_ventilation_east where `point_id` in ($inCondition)";
-//
-//        $res = $this->executeSql($sqlStr, 1);
-//        $baseData=[];
-//        for ($i = 0; $i < count($res); $i++) {
-//            $key=$res[$i]->point_id;
-//            $val=$res[$i]->value;
-//            $baseData[$key]=$val;
-//        }
-
-        $tbName = 'dcs_data_ventilation_east';
-        $baseData = $this->getBaseDataArr($tbName, $keys);
+        $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
+
+        if($dataFromGetRequest['data'] == 0) {
+            $msg = $dataFromGetRequest['Message'];
+            return $this->error(-1, $msg);
+        }
+
+        $baseData = $dataFromGetRequest['data'];
 
         $data['tab']=[
             [
@@ -1013,8 +1026,6 @@ class ZQDcsFanController  extends BaseController
 
         $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
 
-//        $tbName = 'dcs_data_ventilation_east';
-//        $baseData = $this->getBaseDataArr($tbName, $keys);
         if($dataFromGetRequest['data'] == 0) {
             $msg = $dataFromGetRequest['Message'];
             return $this->error(-1, $msg);