摄像头访问记录列表

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

@@ -1239,9 +1239,16 @@ class CameraApiController extends BaseController
     }
 
     //摄像头访问记录入库
-    public function cameraRecordInsert(Request $request){
+    public function cameraRecordList(Request $request){
         $params = $request->all();
-        if(isset($params['staff_num']) && isset($params['name']) && isset($params['camera_id']) && isset($params['start_time']) && isset($params['end_time'])){
+
+        if (!isset($params['camera_id'])) {
+            return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
+        }
+
+        $camera_record = DB::table('camera_record')->where('camera_id',$params['camera_id'])->where('deleted_at',null)->orderBy('created_at','desc')->limit(20)->get();
+
+        if(isset($params['staff_num']) && isset($params['name']) && isset($params['camera_id']) && isset($params['start_time'])){
             $camera = DB::table('camera_list')->where('id',$params['camera_id'])->get();
             $mine = DB::table('mine_list')->where('id',$camera[0]->mine_id)->get();
             $degree = explode('|',$mine[0]->degree);
@@ -1253,28 +1260,18 @@ class CameraApiController extends BaseController
             $data['camera_id'] = $params['camera_id'];
             $data['camera_name'] = $camera[0]->camera_name;
             $data['unit_name'] = $unit[0]->title;
-            if(isset($params['base64'])){
+            if(isset($params['base64']) && $params['base64'] != null && $params['base64'] != ''){
                 $data['base64'] = $params['base64'];
             }
             $data['start_time'] = date('Y-m-d').' '.$params['start_time'];
-            $data['start_time'] = date('Y-m-d').' '.$params['end_time'];
+            // $data['start_time'] = date('Y-m-d').' '.$params['end_time'];
             $data['created_at'] = date('Y-m-d H:i:s');
             $data['updated_at'] = date('Y-m-d H:i:s');
 
             DB::table('camera_record')->insert($data);
-        }
-    }
-
-    //摄像头访问记录入库
-    public function cameraRecordList(Request $request){
-        $params = $request->all();
 
-        if (!isset($params['camera_id'])) {
-            return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
         }
 
-        $camera_record = DB::table('camera_record')->where('camera_id',$params['camera_id'])->where('deleted_at',null)->orderBy('created_at','desc')->limit(20)->get();
-
         return self::successResponse($camera_record);
     }
 }

Modules/Camera/Routes/api.php

@@ -52,6 +52,5 @@ Route::namespace('Api')->group(function () {
     Route::post('article_list','CameraApiController@articleList');//文章列表
     Route::post('duty_information','CameraApiController@dutyInformation');//值班信息
     Route::post('type_list','CameraApiController@typeList');//分类列表
-    Route::post('camera_record_insert','CameraApiController@cameraRecordInsert');//摄像托访问记录入库
     Route::post('camera_record_list','CameraApiController@cameraRecordList');//摄像托访问记录列表
 });