接口

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

@@ -3434,24 +3434,26 @@ class ZQDcsSupportController  extends BaseController
             ],
         ];
 
-        $info = ["table"];
         foreach ($line as $key => $value) {
-            $groupArr = $line[$key];
             $groupChild = [
                 "title"=>$key,
                 "thead"=>["测点名称", "实时值", "状态", "状态变化时间"],
             ];
 
-            for ($i = 0; $i < count($groupArr); $i++) {
-                $p = $groupArr[$i];
-                $groupChild['tbody'][] = [
-                    $p['PointName'],
-                    $p['V'],
-                    $p['V'] == -9999 ? "未知" : "正常",
-                    $p['V'] == -9999 ? "-----" : $p['T']
-                ];
+            for ($i = 0; $i < count($value); $i++) {
+                $p = $value[$i];
+                if (isset($rawArr[$p])) {
+                    $groupChild["tbody"][] = [
+                        $rawArr[$p]["PointName"],
+                        $rawArr[$p]["V"],
+                        $rawArr[$p]["V"] == -9999 ? "未知" : "正常",
+                        $rawArr[$p]["V"] == -9999 ? "-----" : $rawArr[$p]["T"]
+                    ];
+                } else {
+                    continue;
+                }
             }
-            $info['table'][] = $p;
+            $info['table'][] = $groupChild;
         }
 
         return json_encode($info);
@@ -3798,25 +3800,25 @@ class ZQDcsSupportController  extends BaseController
 
         $rowArr = $this->apiService->rawArr;
 
-        $info = ["table"];
+        $lineArr = [
+            "title"=>"应急广播",
+            "thead"=>["测点名称", "实时值", "状态", "状态变化时间"],
+        ];
         foreach ($rowArr as $key => $value) {
             $row = $rowArr[$key];
             $groupChild = [
-                "title"=>$key,
+                "title"=>"应急广播",
                 "thead"=>["测点名称", "实时值", "状态", "状态变化时间"],
             ];
-
-            for ($i = 0; $i < count($row); $i++) {
-                $p = $row[$i];
-                $groupChild['tbody'][] = [
-                    $p['PointName'],
-                    $p['V'],
-                    $p['V'] == -9999 ? "未知" : "正常",
-                    $p['V'] == -9999 ? "-----" : $p['T']
-                ];
-            }
-            $info['table'][] = $p;
+            $lineArr["tbody"][] = [
+                $row["PointName"],
+                $row["V"],
+                $row["V"] == -9999 ? "未知" : "正常",
+                $row["V"] == -9999 ? "-----" : date("Y-m-d H:i:s", strtotime($row["T"]))
+            ];
         }
+
+        return json_encode(["table"=>$lineArr]);
     }
 
 
@@ -3835,7 +3837,7 @@ class ZQDcsSupportController  extends BaseController
 
         foreach ($urlArr as $key => $value) {
             // 获取点位数据
-            $res[$key] = $this->apiService->getApiData($value);
+            $res[$key] = $this->apiService->postApiData($value, []);
 
         }
         $info["info"] = [
@@ -3847,31 +3849,29 @@ class ZQDcsSupportController  extends BaseController
         ];
 
         // 分站
-//        $info["series"] = [];
         $fenzhanArr = $res['fenzhan'];
         $seriesArr = [];
-        for ($i = 0; $i < count($fenzhanArr); $i++) {
-            $fenzhan = $fenzhanArr[$i];
-            $seriesInfoRow = [
-                "name"=>$fenzhan['categories'][$i],
-                "value"=>$fenzhan['data'][$i]
+        for ($i = 0; $i < count($fenzhanArr['data']); $i++) {
+            $categories = $fenzhanArr['categories'][$i];
+            $value = $fenzhanArr['data'][$i];
+            $seriesArr["data"][] = [
+                "name"=>$categories,
+                "value"=>$value
             ];
-            $seriesArr["data"][] = $seriesInfoRow;
         }
-        $info["series"] = [$seriesArr];
+        $info["series"][] = $seriesArr;
 
         // 7日降雨
         $jiangyuliangArr = $res['jiangyuliang'];
-        for ($i = 0; $i < (count($jiangyuliangArr) > 7 ? 7 : count($jiangyuliangArr)); $i++) {
-            $jiangyuliang = $jiangyuliangArr[$i];
-            $categories[] = substr($jiangyuliang["categories"][$i], 5);
-            $datas[] = $jiangyuliang["data"][$i];
-        }
+        $categories = array_map(function($date) {
+                return date("m-d", strtotime($date));
+            }, $jiangyuliangArr['categories']
+        );
         $info["7day"] = [
-            "categories" => $categories,
+            "categories" => array_slice($categories, -7),
             "series" => [[
                 "name"=>"降雨量",
-                "data"=>$datas,
+                "data"=>array_slice($jiangyuliangArr['data'], -7),
             ]],
         ];
 
@@ -3880,10 +3880,10 @@ class ZQDcsSupportController  extends BaseController
         $tbody = [];
         for ($i = 0; $i < count($jingxiaArr); $i++) {
             $jingxia = $jingxiaArr[$i];
-            $tbody = [
+            $tbody[] = [
                 $jingxia["Code"],
                 $jingxia["Address"],
-                $jingxia["uDataTime"],
+                $jingxia["uDateTime"],
                 $jingxia["SensorTypeName"],
                 $jingxia["Value"],
                 $jingxia["MeasureName"],
@@ -3894,15 +3894,15 @@ class ZQDcsSupportController  extends BaseController
         $info["table"][] = [
             "title"=>"井下传感器",
             "thead"=>["传感器编号", "测点位置", "监测时间", "监测量", "监测值", "单位", "监测状态", "变化量"],
-            "tbody"=>[$tbody]
+            "tbody"=>$tbody
         ];
 
         // 地面观测
-        $dimianArr = $res['$dimian']["data"];
+        $dimianArr = $res['dimian']["data"];
         $tbody = [];
         for ($i = 0; $i < count($dimianArr); $i++) {
             $dimian = $dimianArr[$i];
-            $tbody = [
+            $tbody[] = [
                 $dimian["Name"],
                 $dimian["WaterType"],
                 $dimian["uDateTime"],
@@ -3917,11 +3917,11 @@ class ZQDcsSupportController  extends BaseController
         $info["table"][] = [
             "title"=>"地面水文长观孔",
             "thead"=>["孔名", "含水层", "监测时间", "埋深", "埋深变化量", "温度（℃）", "水位（m）", "电压", "水位突变值"],
-            "tbody"=>[$tbody]
+            "tbody"=>$tbody
         ];
 
 
-        return $info;
+        return json_encode($info);
     }
 
 

Modules/OpcData/Services/zaoquan/ZQDcsApiService.php

@@ -109,9 +109,10 @@ class ZQDcsApiService
                 'PageNum'=>"-1"
             ]
         ]);
-        return $response;
+
         // 获取 API 响应的 JSON 数据
         $data = json_decode($response->getBody(), true);
+        return $data;
 
         // 对数据进行重组，这里只是一个示例，具体根据实际需求调整
         $transformedData = $this->transformData($data);