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..73d2c46 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; @@ -172,22 +173,15 @@ public class CameraService { */ 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()); + + List cameras = cameraMapper.selectList(new QueryWrapper<>()); + 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()); + return cameras; } public List allCameras3(){