|
@@ -39,6 +39,35 @@ public class CameraController {
|
|
@Autowired
|
|
@Autowired
|
|
private CameraService cameraService;
|
|
private CameraService cameraService;
|
|
|
|
|
|
|
|
+ @GetMapping("/countCamera")
|
|
|
|
+ @ApiOperation(value = "当前摄像头个数查询")
|
|
|
|
+ @ApiImplicitParams(value = {
|
|
|
|
+ @ApiImplicitParam(paramType = "query", name = "type", value = "摄像头类型,1摄像机,2抓拍设备"),
|
|
|
|
+ @ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
|
|
|
|
+ @ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
|
|
|
|
+ @ApiImplicitParam(paramType = "query", name = "cameraId", value = "摄像头ID"),
|
|
|
|
+ @ApiImplicitParam(paramType = "query", name = "name", value = "摄像头名称")
|
|
|
|
+
|
|
|
|
+ })
|
|
|
|
+ public Result<Integer> countCamera(HttpServletRequest request, @RequestHeader(value = "token") String token,
|
|
|
|
+ @RequestParam(value = "type", required = true) String type,
|
|
|
|
+ @RequestParam(value = "district", required = false) String district,
|
|
|
|
+ @RequestParam(value = "subdistrict", required = false) String subdistrict,
|
|
|
|
+ @RequestParam(value = "cameraId", required = false) Long cameraId,
|
|
|
|
+ @RequestParam(value = "name", required = false) String name
|
|
|
|
+ ){
|
|
|
|
+ try {
|
|
|
|
+ UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
|
|
|
|
+ Integer count = this.cameraService.countCamera(type,district,subdistrict,cameraId,name,loginUser );
|
|
|
|
+ return Result.success("查询成功!",count);
|
|
|
|
+ }catch (BDException e) {
|
|
|
|
+ log.error("当前摄像头个数查询-出现异常",e);
|
|
|
|
+ return PageResult.error(e.getMessage());
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("摄像头管理: 当前摄像头个数出现异常",e);
|
|
|
|
+ return PageResult.error( "获取数据失败");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
@GetMapping("/listCamera")
|
|
@GetMapping("/listCamera")
|
|
@@ -47,7 +76,7 @@ public class CameraController {
|
|
@ApiImplicitParam(paramType = "query", name = "type", value = "摄像头类型,1摄像机,2抓拍设备"),
|
|
@ApiImplicitParam(paramType = "query", name = "type", value = "摄像头类型,1摄像机,2抓拍设备"),
|
|
@ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
|
|
@ApiImplicitParam(paramType = "query", name = "district", value = "所属区域"),
|
|
@ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
|
|
@ApiImplicitParam(paramType = "query", name = "subdistrict", value = "所属街道"),
|
|
- @ApiImplicitParam(paramType = "query", name = "communityId", value = "小区ID"),
|
|
|
|
|
|
+ @ApiImplicitParam(paramType = "query", name = "cameraId", value = "摄像头ID"),
|
|
@ApiImplicitParam(paramType = "query", name = "name", value = "摄像头名称")
|
|
@ApiImplicitParam(paramType = "query", name = "name", value = "摄像头名称")
|
|
|
|
|
|
})
|
|
})
|
|
@@ -55,12 +84,12 @@ public class CameraController {
|
|
@RequestParam(value = "type", required = true) String type,
|
|
@RequestParam(value = "type", required = true) String type,
|
|
@RequestParam(value = "district", required = false) String district,
|
|
@RequestParam(value = "district", required = false) String district,
|
|
@RequestParam(value = "subdistrict", required = false) String subdistrict,
|
|
@RequestParam(value = "subdistrict", required = false) String subdistrict,
|
|
- @RequestParam(value = "communityId", required = false) Long communityId,
|
|
|
|
|
|
+ @RequestParam(value = "cameraId", required = false) Long cameraId,
|
|
@RequestParam(value = "name", required = false) String name,
|
|
@RequestParam(value = "name", required = false) String name,
|
|
PageReqVO pageReqVo){
|
|
PageReqVO pageReqVo){
|
|
try {
|
|
try {
|
|
UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
|
|
UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
|
|
- IPage<CameraVO> pageResponse = this.cameraService.listCamera(type,district,subdistrict,communityId,name,loginUser ,pageReqVo);
|
|
|
|
|
|
+ IPage<CameraVO> pageResponse = this.cameraService.listCamera(type,district,subdistrict,cameraId,name,loginUser ,pageReqVo);
|
|
return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
|
|
return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
|
|
}catch (BDException e) {
|
|
}catch (BDException e) {
|
|
log.error("摄像头列表查询-分页列表出现异常",e);
|
|
log.error("摄像头列表查询-分页列表出现异常",e);
|