|
@@ -1804,15 +1804,20 @@ class CameraApiController extends BaseController
|
|
|
$risk_level = ['高风险','中风险','低风险'];
|
|
|
|
|
|
$type = '';
|
|
|
- $camera_name = '';
|
|
|
+ $camera_name = '无';
|
|
|
$result['camera']['camera_id'] = '';
|
|
|
$result['camera']['parent_id'] = '';
|
|
|
|
|
|
$move_type = '';
|
|
|
- $move_camera_name = '';
|
|
|
+ $move_camera_name = '无';
|
|
|
$result['move_camera']['camera_id'] = '';
|
|
|
$result['move_camera']['parent_id'] = '';
|
|
|
|
|
|
+ $zhifa_type = '';
|
|
|
+ $zhifa_camera_name = '无';
|
|
|
+ $result['zhifa_camera']['camera_id'] = '';
|
|
|
+ $result['zhifa_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')
|
|
@@ -1843,10 +1848,22 @@ class CameraApiController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ $zhifa_camera_info = explode('|',$risk[0]->zhifa_camera_id);
|
|
|
+
|
|
|
+ if(count($zhifa_camera_info) > 1){
|
|
|
+ $zhifa_camera_name = $zhifa_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){
|
|
|
$risk_type_value = $risk_type[$risk[0]->risk_type];
|
|
|
}else{
|
|
|
- $risk_type_value = '';
|
|
|
+ $risk_type_value = '无';
|
|
|
}
|
|
|
|
|
|
$result['detail'] = [
|
|
@@ -1898,6 +1915,10 @@ class CameraApiController extends BaseController
|
|
|
'label' => '移动摄像头:',
|
|
|
'value' => $move_camera_name
|
|
|
],
|
|
|
+ [
|
|
|
+ 'label' => '执法记录仪:',
|
|
|
+ 'value' => $zhifa_camera_name
|
|
|
+ ],
|
|
|
];
|
|
|
|
|
|
$camera_id = explode('|',$risk[0]->camera_id);
|
|
@@ -1917,6 +1938,15 @@ class CameraApiController extends BaseController
|
|
|
}
|
|
|
|
|
|
$result['move_camera']['camera_type'] = $move_type;
|
|
|
+
|
|
|
+ $zhifa_camera_id = explode('|',$risk[0]->zhifa_camera_id);
|
|
|
+
|
|
|
+ if(count($zhifa_camera_id) > 1){
|
|
|
+ $result['zhifa_camera']['camera_id'] = $zhifa_camera_id[0];
|
|
|
+ $result['zhifa_camera']['parent_id'] = $zhifa_camera_id[1];
|
|
|
+ }
|
|
|
+
|
|
|
+ $result['zhifa_camera']['camera_type'] = $zhifa_type;
|
|
|
}
|
|
|
|
|
|
return self::successResponse($result);
|