枣泉数据

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

@@ -643,43 +643,43 @@ class ZQDcsSupportController  extends BaseController
                         "data"=>[
                             [
                                 "label"=>"PM2.5",
-                                "value"=>"5 ug/m³"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"噪声",
-                                "value"=>"64.8 db"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"PM10",
-                                "value"=>"5 ug/m³"
+                                "value"=>"##³"
                             ],
                             [
                                 "label"=>"温度",
-                                "value"=>"25.2 ℃"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"大气压",
-                                "value"=>"86.2 Kpa"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风向",
-                                "value"=>"0 °"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"TSP",
-                                "value"=>"5 ug/m³"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风力",
-                                "value"=>"5 级"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"湿度",
-                                "value"=>"25.5 %RH"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风速",
-                                "value"=>"8.2 m/s"
+                                "value"=>"##"
                             ],
                         ]
                     ],
@@ -688,43 +688,43 @@ class ZQDcsSupportController  extends BaseController
                         "data"=>[
                             [
                                 "label"=>"PM2.5",
-                                "value"=>"451 ug/m³"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"噪声",
-                                "value"=>"57.8 db"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"PM10",
-                                "value"=>"2570 ug/m³"
+                                "value"=>"##³"
                             ],
                             [
                                 "label"=>"温度",
-                                "value"=>"26 ℃"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"大气压",
-                                "value"=>"86.3 Kpa"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风向",
-                                "value"=>"270 °"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"TSP",
-                                "value"=>"3486 ug/m³"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风力",
-                                "value"=>"3 级"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"湿度",
-                                "value"=>"25.2 %RH"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风速",
-                                "value"=>"4.3 m/s"
+                                "value"=>"##"
                             ],
                         ]
                     ],
@@ -733,43 +733,43 @@ class ZQDcsSupportController  extends BaseController
                         "data"=>[
                             [
                                 "label"=>"PM2.5",
-                                "value"=>"355 ug/m³"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"噪声",
-                                "value"=>"59.3 db"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"PM10",
-                                "value"=>"1591 ug/m³"
+                                "value"=>"##³"
                             ],
                             [
                                 "label"=>"温度",
-                                "value"=>"27.9 ℃"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"大气压",
-                                "value"=>"86.3 Kpa"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风向",
-                                "value"=>"135 °"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"TSP",
-                                "value"=>"1857 ug/m³"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风力",
-                                "value"=>"2 级"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"湿度",
-                                "value"=>"23.1 %RH"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风速",
-                                "value"=>"2.2 m/s"
+                                "value"=>"##"
                             ],
                         ]
                     ],
@@ -778,43 +778,43 @@ class ZQDcsSupportController  extends BaseController
                         "data"=>[
                             [
                                 "label"=>"PM2.5",
-                                "value"=>"179 ug/m³"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"噪声",
-                                "value"=>"56.8 db"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"PM10",
-                                "value"=>"811 ug/m³"
+                                "value"=>"##³"
                             ],
                             [
                                 "label"=>"温度",
-                                "value"=>"26.1 ℃"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"大气压",
-                                "value"=>"86.2 Kpa"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风向",
-                                "value"=>"90 °"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"TSP",
-                                "value"=>"894 ug/m³"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风力",
-                                "value"=>"4 级"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"湿度",
-                                "value"=>"24.7 %RH"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风速",
-                                "value"=>"5.5 m/s"
+                                "value"=>"##"
                             ],
                         ]
                     ],
@@ -823,43 +823,43 @@ class ZQDcsSupportController  extends BaseController
                         "data"=>[
                             [
                                 "label"=>"PM2.5",
-                                "value"=>"17 ug/m³"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"噪声",
-                                "value"=>"47.2 db"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"PM10",
-                                "value"=>"14450 ug/m³"
+                                "value"=>"##³"
                             ],
                             [
                                 "label"=>"温度",
-                                "value"=>"26.3 ℃"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"大气压",
-                                "value"=>"86.4 Kpa"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风向",
-                                "value"=>"0 °"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"TSP",
-                                "value"=>"45712 ug/m³"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风力",
-                                "value"=>"2 级"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"湿度",
-                                "value"=>"27.5 %RH"
+                                "value"=>"##"
                             ],
                             [
                                 "label"=>"风速",
-                                "value"=>"2.2 m/s"
+                                "value"=>"##"
                             ],
                         ]
                     ],

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

@@ -510,8 +510,8 @@ class ZQDcsWorkFaceController  extends BaseController
         ];
 
         // 获取点位数据
-        $hisData = $this->apiService->postDcsHisData($pointIds, $startTime, $endTime);
-        $hisDataPoint = $hisData['data']['PointDatas'];
+        $hisData = $this->apiService->postDcsHisData($pointIds, $starttime, $endtime);
+        $hisDataPoint = $hisData[0]['PointDatas'];
         $hisTime = array_column($hisDataPoint, 'T');
         $hisVal = array_column($hisDataPoint, 'V');
 

Modules/OpcData/Services/zaoquan/ZQDcsApiService.php

@@ -73,13 +73,11 @@ class ZQDcsApiService
                 // 其他头部信息
             ],
             'json' =>[
-                'PointValueTypeID'=>"1",
                 'IDs' => $pointIds,
                 'StartTime' => $startTime,
                 'EndTime' => $endTime
             ]
         ]);
-
         // 获取 API 响应的 JSON 数据
         $res = json_decode($response->getBody(), true);
 
@@ -88,11 +86,7 @@ class ZQDcsApiService
         }
 
         $data = isset($res['Data'])? $res['Data']: null;
-
-        $transformedData['data'] = $this->transformData($data);
-        $transformedData['IsSuccessful'] =1;
-
-        return $transformedData;
+        return $data;
     }