From 4228cb1c7b306d1ecd02ea50d9082d908d44dff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Tue, 16 Apr 2024 16:16:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=82=BB=E9=80=BC=E7=9A=84=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=A2=99=E6=9F=A5=E7=9C=8B=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhehekeji/web/service/CameraService.java | 31 +++++++------------ 1 file changed, 11 insertions(+), 20 deletions(-) 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 dfba0e5..941fa1b 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java @@ -1,6 +1,7 @@ package com.zhehekeji.web.service; import com.alibaba.excel.EasyExcel; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zhehekeji.core.util.Assert; @@ -171,33 +172,23 @@ public class CameraService { * @return */ public List allCameras1(){ - - List cameras = cameraMapper.selectByMap(new HashMap<>()); - return cameras.stream().filter(camera -> { - int index = Integer.parseInt(camera.getName().substring(2, 4)); - boolean b = index >= 1 && index <= 5; - return b; - }).collect(Collectors.toList()); + Integer num = configProperties.getVideoStyleConfig().getVideoStyleRow() *configProperties.getVideoStyleConfig().getVideoStyleColumn(); + Integer count = cameraMapper.selectCount(new QueryWrapper()); + List cameras = cameraMapper.selectList(new QueryWrapper().last("limit "+num)); + return cameras; } public List allCameras2(){ - - List cameras = cameraMapper.selectByMap(new HashMap<>()); - return cameras.stream().filter(camera -> { - int index = Integer.parseInt(camera.getName().substring(2, 4)); - boolean b = index >= 6 && index <= 10; - return b; - }).collect(Collectors.toList()); + Integer num = configProperties.getVideoStyleConfig().getVideoStyleRow() *configProperties.getVideoStyleConfig().getVideoStyleColumn(); + List cameras = cameraMapper.selectList(new QueryWrapper().last("limit "+num +","+num)); + return cameras; } public List allCameras3(){ + Integer num = configProperties.getVideoStyleConfig().getVideoStyleRow() *configProperties.getVideoStyleConfig().getVideoStyleColumn(); + List cameras = cameraMapper.selectList(new QueryWrapper().last("limit "+num*2+","+num)); - List cameras = cameraMapper.selectByMap(new HashMap<>()); - return cameras.stream().filter(camera -> { - int index = Integer.parseInt(camera.getName().substring(2, 4)); - boolean b = index >= 11 && index <= 15; - return b; - }).collect(Collectors.toList()); + return cameras; } /**