宁煤摄像头ws协议

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

@@ -201,7 +201,7 @@ class HaiKangController extends BaseController
         $params['regionId'] = 'root000000';
         $params['includeSubNode'] = '1';
         $params['indexCodes'] = [$indexCode];
-        $params['status'] = '1';
+//        $params['status'] = '1';
         $params['pageNo']   = 1;
         $params['pageSize'] = 20;
         $this->sign         = $this->get_sign($url);
@@ -665,7 +665,7 @@ class HaiKangController extends BaseController
         $url        = $this->artemis.'/api/video/v1/cameras/previewURLs';
         $params['cameraIndexCode'] = $query->index_code;
         $params['streamType']      = $code_stream;  //0主码流 1子码流 2第三码流
-        $params['protocol']        = 'hls';//rtmp
+        $params['protocol']        = 'ws';//rtmp
         $params['transmode']       = 1;  //0:UDP 1:TCP
         $params['expand'] = 'streamform=rtp';
 
@@ -697,7 +697,7 @@ class HaiKangController extends BaseController
 
         $ffmpeg_rtmp = $rtmp['data']['url'];
 
-        $rtmp['data']['url'] = substr_replace($rtmp['data']['url'],env('HK_HLS'),0,22);
+        $rtmp['data']['url'] = substr_replace($rtmp['data']['url'],env('HK_HLS_JF'),0,20);
 
         $result['data'] = [
             'camera_id' => Input::get('camera_id'),

Modules/Camera/Services/CameraServices.php

@@ -324,7 +324,7 @@ class CameraServices
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
 
-        $query = CameraList::where('is_show', CameraEnum::IS_SHOW_YES)->orderBy('sort', 'desc');
+        $query = CameraList::where('is_show', CameraEnum::IS_SHOW_YES)->orderBy('sort', 'desc')->orderBy('camera_status');
 
         if ($camera_type && $camera_type != CameraEnum::CAMERA_TYPE_ALL) {
             $query = $query->where('camera_type', $camera_type);