From 899f47eb8aec84d90bce7a06503cc4943750ede5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Fri, 12 Jan 2024 10:31:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=A2=99=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhehekeji/web/service/CameraService.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 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..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(){