From f245bf582c3a02ebe634ad6c9028aaf0ec9178fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Thu, 14 Dec 2023 16:09:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E5=B1=8F=E5=A2=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhehekeji/web/controller/RealTimeController.java | 6 ++++++ .../main/java/com/zhehekeji/web/service/CameraService.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java index 5a55cb3..afccf53 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java @@ -54,6 +54,12 @@ public class RealTimeController { return Result.success(cameraService.allCameras(2)); } + @GetMapping("/allCameras/{page}") + @ApiOperation(value = "全部球机") + //@SessionHandler + public Result> allCamerasPage(@PathVariable Integer page) { + return Result.success(cameraService.allCameras(page)); + } @GetMapping("/wallStyle") @ApiOperation(value = "视频墙样式") //@SessionHandler diff --git a/web/src/main/java/com/zhehekeji/web/service/CameraService.java b/web/src/main/java/com/zhehekeji/web/service/CameraService.java index 3b89b15..14c8718 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java @@ -170,7 +170,7 @@ public class CameraService { public List allCameras(int i){ int count = (configProperties.getVideoStyleConfig().getVideoStyleColumn()) * (configProperties.getVideoStyleConfig().getVideoStyleRow()); - int i1 = count * i; + int i1 = count * (i-1); return cameraMapper.selectList(new QueryWrapper().last("limit "+i1+" ,"+count)); }