|
@@ -107,6 +107,10 @@ class CameraController extends BaseController
|
|
|
$camera_list = $camera_list->where('camera_list.camera_type', $request->input('camera_type'));
|
|
|
}
|
|
|
|
|
|
+ if ($request->has('camera_source') && $request->input('camera_source')) {
|
|
|
+ $camera_list = $camera_list->where('camera_list.camera_source', $request->input('camera_source'));
|
|
|
+ }
|
|
|
+
|
|
|
$camera_list = $camera_list->select(
|
|
|
'camera_list.id',
|
|
|
'camera_list.camera_url',
|
|
@@ -114,10 +118,11 @@ class CameraController extends BaseController
|
|
|
'camera_list.revert_id',
|
|
|
'camera_list.sort',
|
|
|
'camera_list.camera_type',
|
|
|
+ 'camera_list.camera_source',
|
|
|
'camera_list.is_show',
|
|
|
'mine_list.title',
|
|
|
'mine_list.degree'
|
|
|
- )->paginate(50);
|
|
|
+ )->paginate(CameraEnum::PAGE_SIZE);
|
|
|
|
|
|
foreach ($camera_list as $key => $val) {
|
|
|
$camera_list[$key]->parent_title = MineList::where('id', explode('|', $val->degree)[0])->value('title');
|
|
@@ -125,10 +130,11 @@ class CameraController extends BaseController
|
|
|
|
|
|
$tableObj = new TableAuxiliary('camera/list', $camera_list);
|
|
|
|
|
|
- $tableObj->search('input', 'mine_name', '矿区名称');
|
|
|
- $tableObj->search('input', 'area_name', '区域名称');
|
|
|
+// $tableObj->search('input', 'mine_name', '矿区名称');
|
|
|
+// $tableObj->search('input', 'area_name', '区域名称');
|
|
|
$tableObj->search('input', 'camera_name', '摄像头名称');
|
|
|
$tableObj->search('select', 'camera_type', '摄像头类型', CameraEnum::CAMERA_TYPE_EXCHANGE);
|
|
|
+ $tableObj->search('select', 'camera_source', '摄像头来源', CameraEnum::CAMERA_SOURCE_EXCHANGE);
|
|
|
$tableObj->topActions = ['add', 'import', 'importTemplate'];
|
|
|
$tableObj->column('parent_title', '矿区名称');
|
|
|
$tableObj->column('title', '区域名称');
|
|
@@ -136,12 +142,16 @@ class CameraController extends BaseController
|
|
|
$tableObj->column('camera_type', '摄像头类型', function ($camera_type) {
|
|
|
return CameraEnum::CAMERA_TYPE_EXCHANGE[$camera_type];
|
|
|
});
|
|
|
+ $tableObj->column('camera_source', '摄像头来源', function ($camera_source) {
|
|
|
+ return CameraEnum::CAMERA_SOURCE_EXCHANGE[$camera_source];
|
|
|
+ });
|
|
|
// $tableObj->column('revert_id', '流媒体id');
|
|
|
// $tableObj->column('camera_url', '链接');
|
|
|
$tableObj->column('is_show', '是否显示', function ($is_show, $item) {
|
|
|
return '<span class="layui-form"><input type="checkbox" name="is_show" data-href="camera/list/edit?type=show&id=' . $item['id'] . '" lay-skin="switch" lay-text="是|否" ' . ($is_show == CameraEnum::IS_SHOW_YES ? 'checked' : '') . '></span>';
|
|
|
});
|
|
|
$tableObj->column('sort', '排序');
|
|
|
+ $data['pagesize'] = ceil($camera_list->total()/CameraEnum::PAGE_SIZE);
|
|
|
$data['path'] = $tableObj->path;
|
|
|
$data['items'] = $tableObj->items;
|
|
|
$data['columns'] = $tableObj->columns;
|
|
@@ -197,10 +207,93 @@ class CameraController extends BaseController
|
|
|
|
|
|
//摄像头管理区域列表ajax
|
|
|
public function cameraUpdate(){
|
|
|
- $camera_list = DB::table('camera_list')->where('mine_id',$_GET['id'])->get();
|
|
|
- foreach($camera_list as $k=>$v){
|
|
|
- $v->camera_type = CameraEnum::CAMERA_TYPE_EXCHANGE[$v->camera_type];
|
|
|
+// $camera_list = DB::table('camera_list')->where('mine_id',$_GET['id'])->get();
|
|
|
+// foreach($camera_list as $k=>$v){
|
|
|
+// $v->camera_type = CameraEnum::CAMERA_TYPE_EXCHANGE[$v->camera_type];
|
|
|
+// }
|
|
|
+ $camera_list = CameraList::join(
|
|
|
+ 'mine_list', 'camera_list.mine_id', '=', 'mine_list.id'
|
|
|
+ )->orderBy('camera_list.sort', 'desc');
|
|
|
+
|
|
|
+ if ($_GET['mine_id'] != '' && $_GET['mine_id'] != null) {
|
|
|
+ $camera_list = $camera_list->where('camera_list.mine_id', $_GET['mine_id']);
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($_GET['camera_name'] != '' && $_GET['camera_name'] != null) {
|
|
|
+ $camera_list = $camera_list->where('camera_list.camera_name', 'like', '%' . $_GET['camera_name'] . '%');
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($_GET['camera_type'] != 0) {
|
|
|
+ $camera_list = $camera_list->where('camera_list.camera_type', $_GET['camera_type']);
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($_GET['camera_source'] != 0) {
|
|
|
+ $camera_list = $camera_list->where('camera_list.camera_source', $_GET['camera_source']);
|
|
|
+ }
|
|
|
+
|
|
|
+ $camera_list = $camera_list->select(
|
|
|
+ 'camera_list.id',
|
|
|
+ 'camera_list.camera_url',
|
|
|
+ 'camera_list.camera_name',
|
|
|
+ 'camera_list.revert_id',
|
|
|
+ 'camera_list.sort',
|
|
|
+ 'camera_list.camera_type',
|
|
|
+ 'camera_list.camera_source',
|
|
|
+ 'camera_list.is_show',
|
|
|
+ 'mine_list.title',
|
|
|
+ 'mine_list.degree'
|
|
|
+ )->paginate(CameraEnum::PAGE_SIZE);
|
|
|
+
|
|
|
+ foreach ($camera_list as $key => $val) {
|
|
|
+ $camera_list[$key]->parent_title = MineList::where('id', explode('|', $val->degree)[0])->value('title');
|
|
|
+ $val->camera_type = CameraEnum::CAMERA_TYPE_EXCHANGE[$val->camera_type];
|
|
|
+ $val->camera_source = CameraEnum::CAMERA_SOURCE_EXCHANGE[$val->camera_source];
|
|
|
+ }
|
|
|
+
|
|
|
+ return $camera_list;
|
|
|
+ }
|
|
|
+
|
|
|
+ //摄像头管理区域列表ajax
|
|
|
+ public function camerapage(){
|
|
|
+ $camera_list = CameraList::join(
|
|
|
+ 'mine_list', 'camera_list.mine_id', '=', 'mine_list.id'
|
|
|
+ )->orderBy('camera_list.sort', 'desc');
|
|
|
+
|
|
|
+ if ($_GET['mine_id'] != '' && $_GET['mine_id'] != null) {
|
|
|
+ $camera_list = $camera_list->where('camera_list.mine_id', $_GET['mine_id']);
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($_GET['camera_name'] != '' && $_GET['camera_name'] != null) {
|
|
|
+ $camera_list = $camera_list->where('camera_list.camera_name', 'like', '%' . $_GET['camera_name'] . '%');
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($_GET['camera_type'] != 0) {
|
|
|
+ $camera_list = $camera_list->where('camera_list.camera_type', $_GET['camera_type']);
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($_GET['camera_source'] != 0) {
|
|
|
+ $camera_list = $camera_list->where('camera_list.camera_source', $_GET['camera_source']);
|
|
|
+ }
|
|
|
+
|
|
|
+ $camera_list = $camera_list->select(
|
|
|
+ 'camera_list.id',
|
|
|
+ 'camera_list.camera_url',
|
|
|
+ 'camera_list.camera_name',
|
|
|
+ 'camera_list.revert_id',
|
|
|
+ 'camera_list.sort',
|
|
|
+ 'camera_list.camera_type',
|
|
|
+ 'camera_list.camera_source',
|
|
|
+ 'camera_list.is_show',
|
|
|
+ 'mine_list.title',
|
|
|
+ 'mine_list.degree'
|
|
|
+ )->paginate(CameraEnum::PAGE_SIZE);
|
|
|
+
|
|
|
+ foreach ($camera_list as $key => $val) {
|
|
|
+ $camera_list[$key]->parent_title = MineList::where('id', explode('|', $val->degree)[0])->value('title');
|
|
|
+ $val->camera_type = CameraEnum::CAMERA_TYPE_EXCHANGE[$val->camera_type];
|
|
|
+ $val->camera_source = CameraEnum::CAMERA_SOURCE_EXCHANGE[$val->camera_source];
|
|
|
}
|
|
|
+
|
|
|
return $camera_list;
|
|
|
}
|
|
|
|
|
@@ -248,7 +341,6 @@ class CameraController extends BaseController
|
|
|
'mine_list.title',
|
|
|
'mine_list.degree'
|
|
|
)->first();
|
|
|
-
|
|
|
//工作面列表
|
|
|
$working_surface = WorkingSurfaceCamera::join(
|
|
|
'working_surface', 'working_surface_camera.surface_id', '=', 'working_surface.id'
|
|
@@ -256,8 +348,8 @@ class CameraController extends BaseController
|
|
|
|
|
|
$camera_list->parent_title = MineList::where('id', explode('|', $camera_list->degree)[0])->value('title');
|
|
|
$camera_list->working_surface = $working_surface;
|
|
|
-
|
|
|
$tableObj = new TableAuxiliary('', $camera_list);
|
|
|
+
|
|
|
$tableObj->column('parent_title', '矿区名称');
|
|
|
$tableObj->column('title', '区域名称');
|
|
|
$tableObj->column('camera_name', '摄像头名称');
|
|
@@ -270,19 +362,50 @@ class CameraController extends BaseController
|
|
|
$tableObj->column('video_recorder', '视频服务器来源', function ($video_recorder) {
|
|
|
return CameraEnum::VIDEO_RECORDER_EXCHANGE[$video_recorder];
|
|
|
});
|
|
|
- $tableObj->column('revert_id', '流媒体id');
|
|
|
- $tableObj->column('user_name', '用户名');
|
|
|
- $tableObj->column('password', '密码');
|
|
|
- $tableObj->column('ip', 'ip地址');
|
|
|
- $tableObj->column('port', '端口');
|
|
|
- $tableObj->column('com_number', '通道号');
|
|
|
- $tableObj->column('camera_url', '链接');
|
|
|
- $tableObj->column('sort', '排序');
|
|
|
- $tableObj->column('working_surface', '所属矿区区域');
|
|
|
- $tableObj->column('cover_picture', '封面图片', function($cover_picture) {
|
|
|
- return '<img src="'.$cover_picture.'">';
|
|
|
- });
|
|
|
- $tableObj->title = '摄像头链接详情';
|
|
|
+
|
|
|
+ if($camera_list->revert_id != '' && $camera_list->revert_id != null){
|
|
|
+ $tableObj->column('revert_id', '流媒体id');
|
|
|
+ }
|
|
|
+
|
|
|
+ if($camera_list->user_name != '' && $camera_list->user_name != null){
|
|
|
+ $tableObj->column('user_name', '用户名');
|
|
|
+ }
|
|
|
+
|
|
|
+ if($camera_list->password != '' && $camera_list->password != null){
|
|
|
+ $tableObj->column('password', '密码');
|
|
|
+ }
|
|
|
+
|
|
|
+ if($camera_list->ip != '' && $camera_list->ip != null){
|
|
|
+ $tableObj->column('ip', 'ip地址');
|
|
|
+ }
|
|
|
+
|
|
|
+ if($camera_list->port != '' && $camera_list->port != null){
|
|
|
+ $tableObj->column('port', '端口');
|
|
|
+ }
|
|
|
+
|
|
|
+ if($camera_list->com_number != '' && $camera_list->com_number != null){
|
|
|
+ $tableObj->column('com_number', '通道号');
|
|
|
+ }
|
|
|
+
|
|
|
+ if($camera_list->camera_url != '' && $camera_list->camera_url != null){
|
|
|
+ $tableObj->column('camera_url', '链接');
|
|
|
+ }
|
|
|
+
|
|
|
+ if($camera_list->sort != '' && $camera_list->sort != null){
|
|
|
+ $tableObj->column('sort', '排序');
|
|
|
+ }
|
|
|
+
|
|
|
+ if($camera_list->working_surface != '' && $camera_list->working_surface != null){
|
|
|
+ $tableObj->column('working_surface', '所属矿区区域');
|
|
|
+ }
|
|
|
+
|
|
|
+ if($camera_list->cover_picture != '' && $camera_list->cover_picture != null){
|
|
|
+ $tableObj->column('cover_picture', '封面图片', function($cover_picture) {
|
|
|
+ return '<img src="'.$cover_picture.'">';
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ $tableObj->title = '摄像头详情';
|
|
|
return $this->tableView($tableObj);
|
|
|
}
|
|
|
|
|
@@ -292,9 +415,12 @@ class CameraController extends BaseController
|
|
|
$mineService = new MineServices();
|
|
|
$mineService->initMineList();
|
|
|
$titleList = $mineService->getTierList();
|
|
|
-
|
|
|
$formObj = new FromAuxiliary('camera/list/add');
|
|
|
- $formObj->tree_select('mine_id', '矿区单位', $titleList);
|
|
|
+ if(isset($_GET['mine_id']) && $_GET['mine_id'] != ''){
|
|
|
+ $formObj->tree_select('mine_id', '所属区域', $titleList,$_GET['mine_id']);
|
|
|
+ }else{
|
|
|
+ $formObj->tree_select('mine_id', '所属区域', $titleList);
|
|
|
+ }
|
|
|
$formObj->input('camera_name', '摄像头名称');
|
|
|
$formObj->select('camera_type', '摄像头类型', CameraEnum::CAMERA_TYPE_EXCHANGE, CameraEnum::CAMERA_TYPE_NORMAL);
|
|
|
$formObj->select('camera_source', '摄像头来源', CameraEnum::CAMERA_SOURCE_EXCHANGE, CameraEnum::CAMERA_SOURCE_1);
|
|
@@ -308,7 +434,7 @@ class CameraController extends BaseController
|
|
|
$formObj->select('code_stream', '视频码流', CameraEnum::CODE_STREAM_EXCHANGE, CameraEnum::CODE_STREAM_SUB);
|
|
|
$formObj->input('sort', '排序', CameraEnum::DEFAULT_SORT);
|
|
|
$formObj->uploadImg('cover_picture', '封面图片', '/admin/camera/upload/cover_picture', '');
|
|
|
- $formObj->title = '添加请求链接';
|
|
|
+ $formObj->title = '添加摄像头';
|
|
|
return $this->from($formObj);
|
|
|
}
|
|
|
|
|
@@ -387,7 +513,7 @@ class CameraController extends BaseController
|
|
|
$default_surface = WorkingSurfaceCamera::where('camera_id', $id)->value('surface_id');
|
|
|
|
|
|
$formObj = new FromAuxiliary('camera/list/edit', $camera_list);
|
|
|
- $formObj->tree_select('mine_id', '矿区单位', $titleList);
|
|
|
+ $formObj->tree_select('mine_id', '所属区域', $titleList);
|
|
|
$formObj->input('camera_name', '摄像头名称');
|
|
|
$formObj->select('camera_type', '摄像头类型', CameraEnum::CAMERA_TYPE_EXCHANGE);
|
|
|
$formObj->select('camera_source', '摄像头来源', CameraEnum::CAMERA_SOURCE_EXCHANGE);
|
|
@@ -402,7 +528,7 @@ class CameraController extends BaseController
|
|
|
$formObj->input('sort', '排序');
|
|
|
$formObj->select('surface_id', '所属矿区区域', $surface_arr, $default_surface);
|
|
|
$formObj->uploadImg('cover_picture', '封面图片', '/admin/camera/upload/cover_picture', $camera_list->cover_picture);
|
|
|
- $formObj->title = '编辑请求链接';
|
|
|
+ $formObj->title = '编辑摄像头';
|
|
|
return $this->from($formObj);
|
|
|
}
|
|
|
|
|
@@ -410,7 +536,7 @@ class CameraController extends BaseController
|
|
|
public function cameraListEditPost(Request $request)
|
|
|
{
|
|
|
if (!$request->input('mine_id')) {
|
|
|
- return $this->error(1, '请选择矿区单位');
|
|
|
+ return $this->error(1, '请选择所属区域');
|
|
|
}
|
|
|
|
|
|
if (!$request->input('camera_type')) {
|