Bläddra i källkod

洗选风险作业摄像头接口

任敬轩 9 månader sedan
förälder
incheckning
dfe46d294e

+ 22 - 0
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -1361,6 +1361,28 @@ class CameraApiController extends BaseController
         return json_encode($result);
     }
 
+    //执法记录仪下拉列表
+    public function zhifaCameraSelect(Request $request){
+        $mine_id = 6561;
+
+        $mine_list = DB::table('mine_list')->where('parent_id',$mine_id)->where('show',1)->where('deleted_at',null)->pluck('id');
+
+        $camera_list = DB::table('camera_list')->whereIn('mine_id',$mine_list)->where('is_show',1)->where('camera_status',1)->where('deleted_at',null)->get();
+
+        $result = [];
+
+        if(count($camera_list) > 0){
+            for($i=0;$i<count($camera_list);$i++){
+                $result[$i] = [
+                    'name'  => $camera_list[$i]->camera_name,
+                    'value' => $camera_list[$i]->id.'|'.$mine_id.'|'.$camera_list[$i]->camera_name.'|'.$camera_list[$i]->camera_type
+                ];
+            }
+        }
+
+        return $result;
+    }
+
     //摄像头信息
     public function cameraInfo(Request $request){
         $params = $request->all();

+ 1 - 1
Modules/Camera/Http/Controllers/Api/TdwyController.php

@@ -266,7 +266,7 @@ class TdwyController extends BaseController
                     'public_key'=>$public_key
                 ];
                 $result2 = $this->httpRequest($ip.$url2,'post',$params);
-                if($result2['data']['access_token']){
+                if(isset($result2['data']['access_token'])){
                     $access_token = $result2['data']['access_token'];
                 }else{
                     return;

+ 1 - 0
Modules/Camera/Routes/api.php

@@ -61,6 +61,7 @@ Route::namespace('Api')->group(function () {
     //洗选高风险录入
     Route::post('camera/camera_select', 'CameraApiController@cameraSelect');//摄像头下拉列表
     Route::post('camera/move_camera_select', 'CameraApiController@moveCameraSelect');//移动摄像头下拉列表
+    Route::post('camera/zhifa_camera_select', 'CameraApiController@zhifaCameraSelect');//执法记录仪下拉列表
     Route::post('camera/camera_info', 'CameraApiController@cameraInfo');//摄像头信息
     Route::post('camera/readme', 'CameraApiController@readme');//使用说明