Parcourir la source

洗选风险作业移动摄像头接口

任敬轩 il y a 11 mois
Parent
commit
c98c180915

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

@@ -1318,7 +1318,7 @@ class CameraApiController extends BaseController
     public function cameraSelect(Request $request){
         $result = '<select style="width:99%;" class="form-control" name="camera"><option value="0">-选择摄像头-</option>';
 
-        $mine_list = DB::table('mine_list')->where('parent_id',6356)->where('deleted_at',null)->get();
+        $mine_list = DB::table('mine_list')->where('parent_id',6356)->where('id','!=',6492)->where('deleted_at',null)->get();
 
         if(count($mine_list) > 0){
             for($i=0;$i<count($mine_list);$i++){
@@ -1328,7 +1328,7 @@ class CameraApiController extends BaseController
                     $result = $result . '<optgroup label="' . $mine_list[$i]->title . '">';
 
                     for($j=0;$j<count($camera_list);$j++){
-                        $result = $result . '<option value="'.$camera_list[$j]->id.'|'.$mine_list[$i]->id.'|'.$camera_list[$j]->camera_name.'|'.$camera_list[$j]->camera_type.'">'.$camera_list[$j]->camera_name.'('.CameraEnum::CAMERA_TYPE_EXCHANGE[$camera_list[$j]->camera_type].')</option>';
+                        $result = $result . '<option value="'.$camera_list[$j]->id.'|'.$mine_list[$i]->id.'|'.$camera_list[$j]->camera_name.'|'.$camera_list[$j]->camera_type.'">'.$camera_list[$j]->camera_name.'</option>';
                     }
 
                     $result = $result . '</optgroup>';
@@ -1341,6 +1341,26 @@ class CameraApiController extends BaseController
         return json_encode($result);
     }
 
+    //移动摄像头下拉列表
+    public function moveCameraSelect(Request $request){
+        $mine_id = 6492;
+
+        $camera = DB::table('camera_list')->where('mine_id',$mine_id)->where('deleted_at',null)->get();
+
+        $result = [];
+
+        if(count($camera) > 0){
+            for($i=0;$i<count($camera);$i++){
+                $result[$i] = [
+                    'name'  => $camera[$i]->camera_name,
+                    'value' => $camera[$i]->id.'|'.$mine_id.'|'.$camera[$i]->camera_name.'|'.$camera[$i]->camera_type
+                ];
+            }
+        }
+
+        return json_encode($result);
+    }
+
     //摄像头信息
     public function cameraInfo(Request $request){
         $params = $request->all();

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

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