diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceLog.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceLog.java
index 71f1b58b..b079e105 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceLog.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceLog.java
@@ -70,6 +70,39 @@ public class DeviceLog extends BaseEntity
@Excel(name = "租户名称")
private String tenantName;
+ /** 查询用的开始时间 */
+ private String beginTime;
+
+ /** 查询用的结束时间 */
+ private String endTime;
+
+ /** 查询的总数 */
+ private int total;
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public String getBeginTime() {
+ return beginTime;
+ }
+
+ public void setBeginTime(String beginTime) {
+ this.beginTime = beginTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
public Integer getMode() {
return mode;
}
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 8622d2ef..7e19f343 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceLogMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceLogMapper.xml
@@ -38,10 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and device_id = #{deviceId}
and identity = #{identity}
and is_monitor=1
- and create_time between #{params.beginTime} and #{params.endTime}
+ and create_time between #{beginTime} and #{endTime}
order by create_time desc
- limit 2000
+ limit #{total}