From 6e052c64abb79ec96d6284032e035753cf217a28 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Fri, 20 May 2022 17:54:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=B7=BB=E5=8A=A0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/iot/DeviceLogMapper.xml    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceLogMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceLogMapper.xml
index 6f3ac8ca..454eabd6 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceLogMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceLogMapper.xml
@@ -29,9 +29,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectMonitorList" parameterType="com.ruoyi.iot.domain.DeviceLog" resultMap="MonitorResult">
         select log_value, create_time from iot_device_log
-        where device_id = #{deviceId} and identity = #{identity} and is_monitor=1
+        <where>
+            <if test="1==1"> and device_id = #{deviceId} </if>
+            <if test="1==1"> and identity = #{identity} </if>
+            <if test="1==1"> and is_monitor=1</if>
+            <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and create_time between #{params.beginTime} and #{params.endTime}</if>
+        </where>
         order by create_time desc
-        limit 2000
+        limit 1000
     </select>
 
     <select id="selectDeviceLogList" parameterType="com.ruoyi.iot.domain.DeviceLog" resultMap="DeviceLogResult">