Bladeren bron

海康获取rtsp流

任敬轩 3 jaren geleden
bovenliggende
commit
f4f47c3873
1 gewijzigde bestanden met toevoegingen van 2 en 27 verwijderingen
  1. 2 27
      Modules/Camera/Http/Controllers/Api/HaiKangController.php

+ 2 - 27
Modules/Camera/Http/Controllers/Api/HaiKangController.php

@@ -311,7 +311,7 @@ class HaiKangController extends BaseController
         return $result;
     }
 
-    public function getHikRtsp($camera_id){
+    public function getHikRtsp(){
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
 
@@ -323,30 +323,6 @@ class HaiKangController extends BaseController
             return $result;
         }
 
-        $degree = MineList::where('id', $query->mine_id)->value('degree');
-
-        $mine_list = MineList::whereIn('id', explode('|', $degree))->select(['title'])->get()->toArray();
-
-        $path = '';
-        foreach ($mine_list as $key => $val) {
-            $path .= '/' . $val['title'];
-        }
-        $new_camera_name = str_replace('-','',$query->camera_name);
-        $new_camera_name = str_replace('#','号',$new_camera_name);
-        $path .= '/' . $new_camera_name;
-
-        //标记摄像头为在线状态
-        CameraList::where('id', Input::get('camera_id'))->update(['camera_status' => CameraEnum::CAMERA_STATUS_ONLINE]);
-
-        //已有拉流id,直接返回拉流链接
-        if($query->revert_id != 'NullId'){
-            $result['data'] = [
-                'camera_id' => Input::get('camera_id'),
-                'url' => env('EASY_DARWIN_JF_RTSP') .  $path
-            ];
-            return  $result;
-        }
-
         if($query->code_stream == 2){
             $code_stream = 0;
         }else{
@@ -367,8 +343,7 @@ class HaiKangController extends BaseController
         $rtsp = json_decode($rtsp, true);
 
         $data = [
-            'url'        => $rtsp['data']['url'],
-            'customPath' => $path,
+            'url'        => $rtsp['data']['url']
         ];
 
         return $data;