Browse Source

请求格式修改

q 1 year ago
parent
commit
e2138e25ac

+ 7 - 7
Modules/OpcData/Http/Controllers/Api/zaoquan/ZQDcsFanController.php

@@ -1013,14 +1013,14 @@ class ZQDcsFanController  extends BaseController
 
         $dataFromGetRequest = $this->apiService->postPointRealData($this->apiUrl, $keys);
 
-        return $dataFromGetRequest;
-
-        // 返回 JSON 响应
-//        return response()->json($transformedData);
-
+//        $tbName = 'dcs_data_ventilation_east';
+//        $baseData = $this->getBaseDataArr($tbName, $keys);
+        if($dataFromGetRequest['data'] == 0) {
+            $msg = $dataFromGetRequest['Message'];
+            return $this->error(-1, $msg);
+        }
 
-        $tbName = 'dcs_data_ventilation_east';
-        $baseData = $this->getBaseDataArr($tbName, $keys);
+        $baseData = $dataFromGetRequest['data'];
 
         $data['tab']=[
             [

+ 10 - 5
Modules/OpcData/Services/zaoquan/ZQDcsApiService.php

@@ -42,18 +42,23 @@ class ZQDcsApiService
                 'Content-Type'=>'application/json; charset=utf-8',
                 // 其他头部信息
             ],
-            'PageNum'=>"-1",
-            'PointIds' => $pointIds,
+            'json' =>[
+                'PageNum'=>"-1",
+                'PointIds' => $pointIds
+            ]
         ]);
 
         // 获取 API 响应的 JSON 数据
         $res = json_decode($response->getBody(), true);
 
-        if($res['Errors']) {
-            return null;
+        if($res['IsSuccessful'] == 0) {
+            return $res;
         }
 
-        $transformedData = $this->transformData($res);
+        $data = isset($res['Data'])? $res['Data']: null;
+
+        $transformedData['data'] = $this->transformData($data);
+        $transformedData['IsSuccessful'] =1;
 
         return $transformedData;
     }