视屏墙修改

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<List<Camera>> allCamerasPage(@PathVariable Integer page) {
+        return Result.success(cameraService.allCameras(page));
+    }
     @GetMapping("/wallStyle")
     @ApiOperation(value = "视频墙样式")
     //@SessionHandler

web/src/main/java/com/zhehekeji/web/service/CameraService.java

@@ -170,7 +170,7 @@ public class CameraService {
 
     public List<Camera> 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<Camera>().last("limit "+i1+" ,"+count));
     }