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 f954fc2..f585d9b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java @@ -188,15 +188,16 @@ public class CameraService extends ServiceImpl { * @return */ public List allCameras1(){ - - - List cameras = cameraMapper.selectList(new QueryWrapper<>()); + int count = configProperties.getVideoStyleConfig().getVideoStyleColumn() * configProperties.getVideoStyleConfig().getVideoStyleRow(); + int group = 0 ; + List cameras = cameraMapper.selectList(new QueryWrapper().last("limit "+group+","+count)); return cameras; } public List allCameras2(){ - - List cameras = cameraMapper.selectByMap(new HashMap<>()); + int count = configProperties.getVideoStyleConfig().getVideoStyleColumn() * configProperties.getVideoStyleConfig().getVideoStyleRow(); + int group = 1* count; + List cameras = cameraMapper.selectList(new QueryWrapper().last("limit "+group+","+count)); return cameras; } diff --git a/web/src/main/resources/libs/MvCameraControlWrapper.jar b/web/src/main/resources/libs/MvCameraControlWrapper.jar new file mode 100644 index 0000000..3e2f591 Binary files /dev/null and b/web/src/main/resources/libs/MvCameraControlWrapper.jar differ diff --git a/web/src/main/resources/libs/opencv-480.jar b/web/src/main/resources/libs/opencv-480.jar new file mode 100644 index 0000000..71a14d3 Binary files /dev/null and b/web/src/main/resources/libs/opencv-480.jar differ