From ecd9d97befbe1543eaffcadaec175ec8da12e43e Mon Sep 17 00:00:00 2001
From: wuweida <2918581207@qq.com>
Date: Tue, 16 Aug 2022 14:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=93=E8=B7=AF=E6=B1=A1=E6=9F=93=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hisense/monitormanage/service/RoadDataService.java  | 2 +-
 src/main/resources/mapper/RoadDataMapper.xml                | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/hisense/monitormanage/service/RoadDataService.java b/src/main/java/com/hisense/monitormanage/service/RoadDataService.java
index 122f4fd..15718df 100644
--- a/src/main/java/com/hisense/monitormanage/service/RoadDataService.java
+++ b/src/main/java/com/hisense/monitormanage/service/RoadDataService.java
@@ -114,7 +114,7 @@ public class RoadDataService {
 
     public List<RoadData> listRoadDataByTimeRegion(String start,String end){
         QueryWrapper<RoadData> wrapper = new QueryWrapper<>();
-        wrapper.between("dt",start,end);
+        wrapper.between("dt",start,end).gt("pm10",150);
         List<RoadData> list = roadDataMapper.selectList(wrapper);
         return list;
     }
diff --git a/src/main/resources/mapper/RoadDataMapper.xml b/src/main/resources/mapper/RoadDataMapper.xml
index 112086d..d5aafbd 100644
--- a/src/main/resources/mapper/RoadDataMapper.xml
+++ b/src/main/resources/mapper/RoadDataMapper.xml
@@ -18,8 +18,10 @@
 
     <select id="selectRoadData" resultType="com.hisense.monitormanage.entity.RoadData">
         SELECT * FROM t_road_data WHERE pm10 > 150 ORDER BY dt DESC
-        <bind name="page" value="(page-1)*pageSize"/>
-        limit #{page},#{pageSize}
+        <if test="page!=null and '' != page and pageSize != null and '' != pageSize">
+            <bind name="page" value="(page-1)*pageSize"/>
+            limit #{page},#{pageSize}
+        </if>
     </select>
 
     <select id="getByMaxId" resultType="com.hisense.monitormanage.entity.RoadData">