大华切片

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

@@ -640,9 +640,11 @@ class CameraApiController extends BaseController
                 $result = CameraServices::getHkHls($camera_id,$parent_id);
 
             }
-            //大华切片逻辑
+            //大华摄像头
             elseif($is_hak == 2){
-                $result = CameraServices::dahuafiles($parent_id, $camera_id);
+                //同步大华视频服务器摄像头
+                $tdwy = new TdwyController();
+                $result = $tdwy->dahuaRtsp($camera_id,$parent_id);
             }
             //信息技术中心测试ws协议
 //            elseif($mine_res[0]-> slug == 'XinXiJiShuZhongXin'){

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

@@ -354,7 +354,11 @@ class TdwyController extends BaseController
             if($result4['data']['url'] && $result4['data']['token']){
                 $rtsp = explode('|',$result4['data']['url']);
                 if($rtsp[1]){
-                    return $rtsp[1].'?token='.$result4['data']['token'];
+                    $result['data'] = [
+                        'camera_id' => $camera_id,
+                        'url' => $rtsp[1].'?token='.$result4['data']['token']
+                    ];
+                    return $result;
                 }
             }
         }