海康easy_drawin

Modules/Camera/Http/Controllers/Api/HaiKangController.php

@@ -373,15 +373,11 @@ class HaiKangController extends BaseController
         //请求流媒体服务器拉流
         $curl_res = curl_request($curl);
 
-
         // DB::table('camera_list')->where('id',$camera_id)->update($res);
         // dd($res);
         Log::info('请求流媒体服务器result------------');
         Log::info($curl_res);
 
-        if(strlen($curl_res) < 20){
-            CameraList::where('id', Input::get('camera_id'))->update(['revert_id' => $curl_res]);
-        }
         if (strpos($curl_res,' ')) {
             //标记摄像头为异常状态
             CameraList::where('id', Input::get('camera_id'))->update(['camera_status' => CameraEnum::CAMERA_STATUS_ERROR]);
@@ -391,6 +387,8 @@ class HaiKangController extends BaseController
             return $result;
         }
 
+        CameraList::where('id', Input::get('camera_id'))->update(['revert_id' => $curl_res]);
+
         $result['data'] = [
             'camera_id' => Input::get('camera_id'),
             'url' => env('EASY_DARWIN_JF_RTSP') . $path

Modules/Camera/Services/CameraServices.php

@@ -564,9 +564,7 @@ class CameraServices
         // dd($res);
         Log::info('请求流媒体服务器result------------');
         Log::info($curl_res);
-        if(strlen($curl_res) < 20){
-            CameraList::where('id', $camera_id)->update(['revert_id' => $curl_res]);
-        }
+
         if (strpos($curl_res,' ')) {
             //标记摄像头为异常状态
             CameraList::where('id', $camera_id)->update(['camera_status' => CameraEnum::CAMERA_STATUS_ERROR]);
@@ -576,6 +574,8 @@ class CameraServices
             return $result;
         }
 
+        CameraList::where('id', $camera_id)->update(['revert_id' => $curl_res]);
+
         $result['data'] = [
             'camera_id' => $camera_id,
             'url' => env('EASY_DARWIN_JF_RTSP') . $path
@@ -592,9 +592,9 @@ class CameraServices
 
         Input::replace(
             [
-                'pre_url'      => trim($mine_ext[0]->ip, '/') . ':' . $mine_ext[0]->port,
-                'app_key' => $mine_ext[0]->key,
-                'app_secret' => $mine_ext[0]->secret,
+                'url'      => trim($mine_ext[0]->ip, '/') . ':' . $mine_ext[0]->port,
+                'key' => $mine_ext[0]->key,
+                'secret' => $mine_ext[0]->secret,
                 'camera_id' => $camera_id,
                 'parent_id' => $parent_id,
             ]