正在显示
1 个修改的文件
包含
58 行增加
和
27 行删除
@@ -13,7 +13,7 @@ use isc\Api as Iscapi; | @@ -13,7 +13,7 @@ use isc\Api as Iscapi; | ||
13 | */ | 13 | */ |
14 | class Isc extends Api | 14 | class Isc extends Api |
15 | { | 15 | { |
16 | - protected $noNeedLogin = ['playbackUrl','gettoken','getTestCameraUrl', 'getCameraUrl','getTestTalkUrl', 'take_pic', 'voice_zhanyong_username']; | 16 | + protected $noNeedLogin = ['playbackUrl','CameraUrlall','getCameraUrl', 'getcamera_search','getCameraUrl', 'getTestTalkUrl', 'take_pic', 'voice_zhanyong_username']; |
17 | protected $noNeedRight = '*'; | 17 | protected $noNeedRight = '*'; |
18 | public $api = null; | 18 | public $api = null; |
19 | 19 | ||
@@ -22,17 +22,18 @@ class Isc extends Api | @@ -22,17 +22,18 @@ class Isc extends Api | ||
22 | parent::_initialize(); | 22 | parent::_initialize(); |
23 | $this->api = new Iscapi(); | 23 | $this->api = new Iscapi(); |
24 | } | 24 | } |
25 | - public function gettoken(){ | ||
26 | - $api = new \app\api\controller\Ysyun(); | ||
27 | - $token = $api->getaccessToken(); | ||
28 | - $this->success('获取成功', $token); | ||
29 | - } | 25 | + |
30 | public function getCameraUrl() | 26 | public function getCameraUrl() |
31 | { | 27 | { |
32 | - $cameraIndexCode= $this->request->param('cameraIndexCode',""); | ||
33 | - $protocol= $this->request->param('protocol',"rtsp"); | ||
34 | - $streamType= $this->request->param('streamType',1); | ||
35 | - $res = $this->api->getPreviewUrl($cameraIndexCode, $protocol, $streamType); | 28 | + $cameraIndexCode = input('post.cameraIndexCode'); |
29 | + $protocol = input('post.protocol', 'rtsp'); | ||
30 | + $streamType = input('post.streamType', 0); | ||
31 | + if ($streamType == 0) { | ||
32 | + $stype = 1; | ||
33 | + } else { | ||
34 | + $stype = 0; | ||
35 | + } | ||
36 | + $res = $this->api->getPreviewUrl($cameraIndexCode, $protocol, $stype); | ||
36 | //获得监控信息,经纬度查询天气预报 | 37 | //获得监控信息,经纬度查询天气预报 |
37 | $info = Db::name('reservoir_hkws_hardware') | 38 | $info = Db::name('reservoir_hkws_hardware') |
38 | ->where(['indexCode' => $cameraIndexCode]) | 39 | ->where(['indexCode' => $cameraIndexCode]) |
@@ -45,31 +46,57 @@ class Isc extends Api | @@ -45,31 +46,57 @@ class Isc extends Api | ||
45 | $res = $this->getTalkUrlFunc($cameraIndexCode); | 46 | $res = $this->getTalkUrlFunc($cameraIndexCode); |
46 | $data['talk'] = $res; | 47 | $data['talk'] = $res; |
47 | 48 | ||
48 | - | ||
49 | $this->success('', $data); | 49 | $this->success('', $data); |
50 | } | 50 | } |
51 | 51 | ||
52 | + /** | ||
53 | + * 回放功能 | ||
54 | + * @return void | ||
55 | + */ | ||
52 | public function playbackUrl() | 56 | public function playbackUrl() |
53 | { | 57 | { |
54 | $cameraIndexCode = input('cameraIndexCode'); | 58 | $cameraIndexCode = input('cameraIndexCode'); |
59 | + $begin_time = input('beginTime'); | ||
60 | + $end_time = input('endTime'); | ||
55 | //时间要为DATE_ISO8601格式 这个等接接口的时候看前端传什么格式的时间再调整 | 61 | //时间要为DATE_ISO8601格式 这个等接接口的时候看前端传什么格式的时间再调整 |
56 | - | ||
57 | - $beginTime = date("Y-m-d\TH:i:s",input('beginTime')).".000+08:00"; | ||
58 | - $endTime = date("Y-m-d\TH:i:s",input('endTime')).".000+08:00"; | ||
59 | - | ||
60 | - | 62 | + if($begin_time>time()){ |
63 | + $this->error("时间选择错误"); | ||
64 | + } | ||
65 | + if($end_time>time()){ | ||
66 | + $this->error("时间选择错误"); | ||
67 | + } | ||
68 | + $beginTime = date("Y-m-d\TH:i:s",$begin_time).".000+08:00"; | ||
69 | + $endTime = date("Y-m-d\TH:i:s",$end_time).".000+08:00"; | ||
61 | $res = $this->api->playbackUrl($cameraIndexCode,$beginTime,$endTime); | 70 | $res = $this->api->playbackUrl($cameraIndexCode,$beginTime,$endTime); |
62 | - $this->success('', $res); | 71 | + if($res['code']=="0"){ |
72 | + foreach ($res['data']['list'] as $k=>$v){ | ||
73 | + $res['data']['list'][$k]['beginTime']=date("Y-m-d H:i:s",strtotime($res['data']['list'][$k]['beginTime'])); | ||
74 | + $res['data']['list'][$k]['endTime']=date("Y-m-d H:i:s",strtotime($res['data']['list'][$k]['endTime'])); | ||
75 | + } | ||
76 | + $this->success('请求成功', $res); | ||
77 | + }else{ | ||
78 | + $data=['cameraIndexCode'=>$cameraIndexCode,'begin_time'=>$begin_time,'end_time'=>$end_time]; | ||
79 | + $errdata=[ | ||
80 | + 'data'=>$data, | ||
81 | + 'res'=>$res | ||
82 | + ]; | ||
83 | + $this->error('请求失败',$errdata); | ||
84 | + } | ||
85 | + | ||
63 | } | 86 | } |
64 | - public function getTestCameraUrl() | ||
65 | - { | ||
66 | - $cameraIndexCode = input('get.cameraIndexCode'); | ||
67 | - $protocol = 'rtsp'; | ||
68 | - $streamType = 1;//input('post.streamType', 0); | ||
69 | - $res = $this->api->getPreviewUrl($cameraIndexCode, $protocol, $streamType); | ||
70 | - var_dump($res); | 87 | + public function CameraUrlall(){ |
88 | + $protocol = $this->request->param('protocol'); | ||
89 | + $hardware=Db::name("reservoir_hkws_hardware")->where('reservoir_id',27)->limit(16)->select(); | ||
90 | + $streamType = "1"; | ||
91 | + $return_data=[]; | ||
92 | + foreach ($hardware as $k=>$v){ | ||
93 | + $cameraIndexCode = $hardware[$k]['indexCode']; | ||
94 | + $res = $this->api->getPreviewUrl($cameraIndexCode,$protocol,$streamType); | ||
95 | + $return_data[$k]=$res; | ||
96 | + $return_data[$k]['name']=$hardware[$k]['name ']; | ||
97 | + } | ||
98 | + $this->success('',$return_data); | ||
71 | } | 99 | } |
72 | - | ||
73 | public function getTalkUrl() | 100 | public function getTalkUrl() |
74 | { | 101 | { |
75 | $cameraIndexCode = input('post.cameraIndexCode'); | 102 | $cameraIndexCode = input('post.cameraIndexCode'); |
@@ -86,7 +113,12 @@ class Isc extends Api | @@ -86,7 +113,12 @@ class Isc extends Api | ||
86 | public function getTestTalkUrl() | 113 | public function getTestTalkUrl() |
87 | { | 114 | { |
88 | $cameraIndexCode = input('get.cameraIndexCode'); | 115 | $cameraIndexCode = input('get.cameraIndexCode'); |
89 | - $res = $this->api->getTalkUrl($cameraIndexCode); | 116 | + $res = $this->api->testgetPreviewUrl($cameraIndexCode); |
117 | + $this->success('', $res); | ||
118 | + } | ||
119 | + public function getcamera_search() | ||
120 | + { | ||
121 | + $res = $this->api->testgetcamera_searchUrl(); | ||
90 | $this->success('', $res); | 122 | $this->success('', $res); |
91 | } | 123 | } |
92 | 124 | ||
@@ -156,5 +188,4 @@ class Isc extends Api | @@ -156,5 +188,4 @@ class Isc extends Api | ||
156 | $this->success("占用人姓名获取成功", $staff_name); | 188 | $this->success("占用人姓名获取成功", $staff_name); |
157 | } | 189 | } |
158 | } | 190 | } |
159 | - | ||
160 | } | 191 | } |
-
请 注册 或 登录 后发表评论