浏览代码

回放url拼接时间

任敬轩 3 年之前
父节点
当前提交
aa85bafcf2

+ 20 - 8
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -304,6 +304,16 @@ class CameraApiController extends BaseController
             return $result;
         }
 
+        $degree = MineList::where('id', $query->mine_id)->value('degree');
+        $degree = explode('|', $degree)[0];
+        $mine_res = DB::table('mine_list')->where('id',$degree)->get();
+
+        //判断摄像头是否是洗选中心的时间+34分钟
+        if($mine_res[0]->slug == 'XiXuanZhongXin'){
+            $start_time = date('Y-m-d H:i:s',strtotime($start_time.'+34 minutes'));
+            $end_time = date('Y-m-d H:i:s',strtotime($end_time.'+34 minutes'));
+        }
+
         $str = '.000+';
         $start_time = date('c', strtotime($start_time));//2022-07-14T08:00:00.000+08:00
         $start_time = explode('+',$start_time);
@@ -312,10 +322,6 @@ class CameraApiController extends BaseController
         $end_time = explode('+',$end_time);
         $end_time = $end_time[0].$str.$end_time[1];
 
-        $degree = MineList::where('id', $query->mine_id)->value('degree');
-        $degree = explode('|', $degree)[0];
-        $mine_res = DB::table('mine_list')->where('id',$degree)->get();
-
         //判断是否在配置文件里,在的不用走ffmpeg
         if(isset($mine_res[0]->title) && in_array($mine_res[0]->title,config('playback'))){
             $result = CameraServices::getPlaybackRtsp($camera_id,$start_time,$end_time);
@@ -355,6 +361,16 @@ class CameraApiController extends BaseController
             return $result;
         }
 
+        $degree = MineList::where('id', $query->mine_id)->value('degree');
+        $degree = explode('|', $degree)[0];
+        $mine_res = DB::table('mine_list')->where('id',$degree)->get();
+
+        //判断摄像头是否是洗选中心的时间+34分钟
+        if($mine_res[0]->slug == 'XiXuanZhongXin'){
+            $start_time = date('Y-m-d H:i:s',strtotime($start_time.'+34 minutes'));
+            $end_time = date('Y-m-d H:i:s',strtotime($end_time.'+34 minutes'));
+        }
+
         $str = '.000+';
         $start_time = date('c', strtotime($start_time));//2022-07-14T08:00:00.000+08:00
         $start_time = explode('+',$start_time);
@@ -363,10 +379,6 @@ class CameraApiController extends BaseController
         $end_time = explode('+',$end_time);
         $end_time = $end_time[0].$str.$end_time[1];
 
-        $degree = MineList::where('id', $query->mine_id)->value('degree');
-        $degree = explode('|', $degree)[0];
-        $mine_res = DB::table('mine_list')->where('id',$degree)->get();
-
         //判断是否在配置文件里,在的不用走ffmpeg
         if(isset($mine_res[0]->title) && in_array($mine_res[0]->title,config('playback'))){
             $result = CameraServices::getPlaybackRtsp($camera_id,$start_time,$end_time);

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

@@ -454,7 +454,7 @@ class HaiKangController extends BaseController
         }
 
         $data = [
-            'url'        => $data['data']['url'],
+            'url'        => $data['data']['url'].'?beginTime='.$start_time.'&endTime='.$end_time.'&playBackMode=1',
             'customPath' => $path,
         ];
 
@@ -523,7 +523,7 @@ class HaiKangController extends BaseController
         $data = json_decode($data, true);
 
         if (isset($data['code']) && $data['code'] == 0) {  // 将内网地址替换为外网地址
-            $video_url = $data['data']['url'];
+            $video_url = $data['data']['url'].'?beginTime='.$start_time.'&endTime='.$end_time.'&playBackMode=1';
 
             preg_match('/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i', $video_url, $res);  // 提取内网ip
             preg_match('/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i', $this->pre_url, $res_n);  // 提取外网ip

+ 3 - 3
Modules/Camera/Http/Controllers/CameraController.php

@@ -39,9 +39,9 @@ class CameraController extends BaseController
     //摄像头列表
     public function cameraList(Request $request)
     {
-//        $start_time = '2022-07-20 08:00:00';
-//        $start_time = date('Y-m-d H:i:s',strtotime($start_time.'+34 minutes'));
-//        dd($start_time);
+        $start_time = '2022-07-20 08:00:00';
+        $start_time = date('Y-m-d H:i:s',strtotime($start_time.'+34 minutes'));
+        dd($start_time);
         $this->menusActive[0] = 'adminCamera';
         $this->menusActive[1] = 'adminCameraList';