Merge remote-tracking branch 'origin/master'

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();
@@ -1474,6 +1494,7 @@ class CameraApiController extends BaseController
                 if(array_key_exists($coal_washery[$i]->name, $coal_list)) {
                     $slog = $coal_list[$coal_washery[$i]->name];
                     $result[$slog]['title'] = $coal_washery[$i]->name;
+                    $result[$slog]['id'] = $coal_washery[$i]->id;
                     $result[$slog]['data'] = [
                         [
                             'name' => '高风险作业',
@@ -1686,6 +1707,14 @@ class CameraApiController extends BaseController
             $type = 0;
         }
 
+        $list = [];
+        if(isset($params['area_id'])){
+            $list = DB::connection('task_xixuan')->table('xx_coal_washery')->where('area_id',$params['area_id'])->pluck('id');
+        }
+        if(isset($params['coal_washery_id'])){
+            $list = [$params['coal_washery_id']];
+        }
+
         $coal_washery_list = DB::connection('task_xixuan')->table('xx_coal_washery')->get();
         if(count($coal_washery_list) > 0){
             for($i=0;$i<count($coal_washery_list);$i++){
@@ -1697,12 +1726,18 @@ class CameraApiController extends BaseController
         $risk = DB::connection('task_xixuan')->table('xx_risk_assignment');
         $risk = $risk->select('xx_risk_assignment.*','xx_coal_washery.name as coal_washery');
         $risk = $risk->leftJoin('xx_coal_washery','xx_coal_washery.id','=','xx_risk_assignment.coal_washery_id');
+        if(count($list) > 0){
+            $risk = $risk->whereIn('coal_washery_id',$list);
+        }
         $risk = $risk->whereDate('xx_risk_assignment.optdt', today());
         if(isset($params['id'])){
             $risk = $risk->where('xx_coal_washery.id',$params['id']);
         }
         $risk = $risk->where('risk_level',$type)->get();
 
+        $risk_level = ['高风险','中风险','低风险'];
+        $risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
+
         $result['data'] = [];
         if(count($risk) > 0){
             for($i=0;$i<count($risk);$i++){
@@ -1710,6 +1745,12 @@ class CameraApiController extends BaseController
                 $result['data'][$i]['unit_name'] = $risk[$i]->coal_washery;
                 $result['data'][$i]['place'] = $risk[$i]->work_location;
                 $result['data'][$i]['content'] = $risk[$i]->risk_name;
+
+                $result['data'][$i]['work_people'] = $risk[$i]->work_people;
+                $result['data'][$i]['work_num'] = $risk[$i]->work_num;
+                $result['data'][$i]['risk_level'] = $risk_level[$risk[$i]->risk_level];
+                $result['data'][$i]['risk_type'] = $risk_type[$risk[$i]->risk_type];
+                $result['data'][$i]['coal_washery'] = $risk[$i]->coal_washery;
             }
         }
 
@@ -1727,6 +1768,16 @@ class CameraApiController extends BaseController
         $risk_type = ['高空坠落','起重伤害','触电','火灾','机械伤害','中毒和窒息'];
         $risk_level = ['高风险','中风险','低风险'];
 
+        $type = '';
+        $camera_name = '';
+        $result['camera']['camera_id'] = '';
+        $result['camera']['parent_id'] = '';
+
+        $move_type = '';
+        $move_camera_name = '';
+        $result['move_camera']['camera_id'] = '';
+        $result['move_camera']['parent_id'] = '';
+
         $risk = DB::connection('task_xixuan')->table('xx_risk_assignment')
             ->select('xx_risk_assignment.*','xx_coal_washery.name as coal_washery')
             ->leftJoin('xx_coal_washery','xx_coal_washery.id','=','xx_risk_assignment.coal_washery_id')
@@ -1735,11 +1786,26 @@ class CameraApiController extends BaseController
         if(count($risk) > 0){
             $camera_info = explode('|',$risk[0]->camera_id);
 
-            $is_hak = MineListExt::where('mine_id', $camera_info[1])->value('is_hak');
-            if($is_hak == 2){
-                $type = 'rtsp';
-            }else{
-                $type = 'm3u8';
+            if(count($camera_info) > 1){
+                $camera_name = $camera_info[2];
+                $is_hak = MineListExt::where('mine_id', $camera_info[1])->value('is_hak');
+                if($is_hak == 2){
+                    $type = 'rtsp';
+                }else{
+                    $type = 'm3u8';
+                }
+            }
+
+            $move_camera_info = explode('|',$risk[0]->move_camera_id);
+
+            if(count($move_camera_info) > 1){
+                $move_camera_name = $move_camera_info[2];
+                $is_hak = MineListExt::where('mine_id', $move_camera_info[1])->value('is_hak');
+                if($is_hak == 2){
+                    $move_type = 'rtsp';
+                }else{
+                    $move_type = 'm3u8';
+                }
             }
 
             if($risk[0]->risk_type != '' && $risk[0]->risk_type !=null){
@@ -1778,16 +1844,32 @@ class CameraApiController extends BaseController
                     'value' => $risk[0]->work_people
                 ],
                 [
-                    'label' => '摄像头类型:',
-                    'value' => CameraEnum::CAMERA_TYPE_EXCHANGE[$camera_info[3]]
+                    'label' => '固定摄像头:',
+                    'value' => $camera_name
+                ],
+                [
+                    'label' => '移动摄像头:',
+                    'value' => $move_camera_name
                 ],
             ];
 
             $camera_id = explode('|',$risk[0]->camera_id);
 
-            $result['camera']['camera_id'] = $camera_id[0];
-            $result['camera']['parent_id'] = $camera_id[1];
+            if(count($camera_id) > 1){
+                $result['camera']['camera_id'] = $camera_id[0];
+                $result['camera']['parent_id'] = $camera_id[1];
+            }
+
             $result['camera']['camera_type'] = $type;
+
+            $move_camera_id = explode('|',$risk[0]->move_camera_id);
+
+            if(count($move_camera_id) > 1){
+                $result['move_camera']['camera_id'] = $move_camera_id[0];
+                $result['move_camera']['parent_id'] = $move_camera_id[1];
+            }
+
+            $result['move_camera']['camera_type'] = $move_type;
         }
 
         return self::successResponse($result);

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');//使用说明