天地伟业接口修改

Modules/Camera/Services/CameraServices.php

@@ -809,13 +809,13 @@ class CameraServices
         CameraList::where('id', $camera_id)->update(['camera_status' => CameraEnum::CAMERA_STATUS_ONLINE]);
 
         //已有拉流id，直接返回拉流链接
-        if($query->revert_id != 'NullId'){
-            $result['data'] = [
-                'camera_id' => $camera_id,
-                'url' => env('EASY_DARWIN_JF_RTSP') .  $path
-            ];
-            return  $result;
-        }
+//        if($query->revert_id != 'NullId'){
+//            $result['data'] = [
+//                'camera_id' => $camera_id,
+//                'url' => env('EASY_DARWIN_JF_RTSP') .  $path
+//            ];
+//            return  $result;
+//        }
 
 
 
@@ -845,16 +845,16 @@ class CameraServices
         Log::info('请求流媒体服务器参数------------');
         Log::info($data);
 
-        $curl = env('EASY_DARWIN_JF_URL') . CameraEnum::API_STREAM_START . '?' . http_build_query($data);
+//        $curl = env('EASY_DARWIN_JF_URL') . CameraEnum::API_STREAM_START . '?' . http_build_query($data);
 
         //请求流媒体服务器拉流
-        $curl_res = curl_request($curl);
+//        $curl_res = curl_request($curl);
 
         //访问记录
         $log['mine_id'] = $query->mine_id;
         $log['camera_id'] = $camera_id;
-        $log['log'] = $curl_res;
-        if(strpos($curl_res,' ')){
+        $log['log'] = $result_td;
+        if(strpos($result_td,' ')){
             $log['status'] = 1;//异常
         }else{
             $log['status'] = 0;//正常
@@ -866,9 +866,9 @@ class CameraServices
         // DB::table('camera_list')->where('id',$camera_id)->update($res);
         // dd($res);
         Log::info('请求流媒体服务器result------------');
-        Log::info($curl_res);
+        Log::info($result_td);
 
-        if (strpos($curl_res,' ')) {
+        if (strpos($result_td,' ')) {
             //标记摄像头为异常状态
             CameraList::where('id', $camera_id)->update(['camera_status' => CameraEnum::CAMERA_STATUS_ERROR]);
 
@@ -878,16 +878,16 @@ class CameraServices
         }
 
         //更新拉流id
-        CameraList::where('id', $camera_id)->update(
-            [
-                'revert_id'  => trim($curl_res, '"'),
-                'updated_at' => date('Y-m-d H:i:s'),
-            ]
-        );
+//        CameraList::where('id', $camera_id)->update(
+//            [
+//                'revert_id'  => trim($curl_res, '"'),
+//                'updated_at' => date('Y-m-d H:i:s'),
+//            ]
+//        );
 
         $result['data'] = [
             'camera_id' => $camera_id,
-            'url' => env('EASY_DARWIN_JF_RTSP') . $path
+            'url' => substr_replace($result_td['content'][0]['url'],env('TD_RTSP'),0,25)
         ];
 
         //查询是否存在封面图