接口返回参数一致

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

@@ -119,11 +119,9 @@ class CameraApiController extends BaseController
 
         if ($is_hak == 1 && !$camera_url) {
             $result = CameraServices::getHkRtsp($camera_id,$parent_id);
-            return $result;
+            return self::successResponse($result);
         }else{
-            $result['status'] = false;
-            $result['msg']    = ApiEnum::HK_REQUEST_FAIL;
-            return $result;
+            return self::errorResponse(ApiEnum::HK_REQUEST_FAIL);
         }
     }
 

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

@@ -342,7 +342,10 @@ class HaiKangController extends BaseController
 
         $rtsp = json_decode($rtsp, true);
 
-        $result['url'] = $rtsp['data']['url'];
+        $result['data'] = [
+            'camera_id' => Input::get('camera_id'),
+            'url' => $rtsp['data']['url']
+        ];
 
         return $result;
     }