diff --git a/springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceLogController.java b/springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceLogController.java
index 4db3b514..90851090 100644
--- a/springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceLogController.java
+++ b/springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceLogController.java
@@ -46,4 +46,17 @@ public class DeviceLogController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询设备日志列表
+     */
+    @ApiOperation("查询设备日志列表")
+    @PreAuthorize("@ss.hasPermi('iot:device:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DeviceLog deviceLog)
+    {
+        startPage();
+        List<DeviceLog> list = deviceLogService.selectDeviceLogList(deviceLog);
+        return getDataTable(list);
+    }
+
 }
diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/DeviceLogMapper.java b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/DeviceLogMapper.java
index 9f8144a8..a5f71e06 100644
--- a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/DeviceLogMapper.java
+++ b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/DeviceLogMapper.java
@@ -82,5 +82,12 @@ public interface DeviceLogMapper
      */
     public int deleteDeviceLogByDeviceNumber(String deviceNumber);
 
+    /**
+     * 查询设备日志列表
+     *
+     * @param deviceLog 设备日志
+     * @return 设备日志集合
+     */
+    public List<DeviceLog> selectDeviceLogList(DeviceLog deviceLog);
 
 }
diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/IDeviceLogService.java b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/IDeviceLogService.java
index 7310cc80..6ced4190 100644
--- a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/IDeviceLogService.java
+++ b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/IDeviceLogService.java
@@ -24,4 +24,12 @@ public interface IDeviceLogService
      */
     public List<MonitorModel> selectMonitorList(DeviceLog deviceLog);
 
+    /**
+     * 查询设备日志列表
+     *
+     * @param deviceLog 设备日志
+     * @return 设备日志集合
+     */
+    public List<DeviceLog> selectDeviceLogList(DeviceLog deviceLog);
+
 }
diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceLogServiceImpl.java b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceLogServiceImpl.java
index 8e033be4..2e5c155b 100644
--- a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceLogServiceImpl.java
+++ b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceLogServiceImpl.java
@@ -38,4 +38,18 @@ public class DeviceLogServiceImpl implements IDeviceLogService
         return logService.selectMonitorList(deviceLog);
     }
 
+    /**
+     * 查询设备日志列表
+     *
+     * @param deviceLog 设备日志
+     * @return 设备日志
+     */
+    @Override
+    public List<DeviceLog> selectDeviceLogList(DeviceLog deviceLog)
+    {
+        if(deviceLog.getIsMonitor()==null){
+            deviceLog.setIsMonitor(0);
+        }
+        return logService.selectDeviceLogList(deviceLog);
+    }
 }
diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/ILogService.java b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/ILogService.java
index 05baa098..b89d8ef9 100644
--- a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/ILogService.java
+++ b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/ILogService.java
@@ -31,5 +31,8 @@ public interface ILogService {
     /** 查询监测数据列表 **/
     List<MonitorModel> selectMonitorList(DeviceLog deviceLog);
 
+    /** 查询物模型日志列表 **/
+    List<DeviceLog> selectDeviceLogList(DeviceLog deviceLog);
+
 
 }
diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/impl/MySqlLogServiceImpl.java b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/impl/MySqlLogServiceImpl.java
index 80fe0bf8..1c63b5c0 100644
--- a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/impl/MySqlLogServiceImpl.java
+++ b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/tdengine/service/impl/MySqlLogServiceImpl.java
@@ -52,4 +52,12 @@ public class MySqlLogServiceImpl implements ILogService {
         return deviceLogMapper.selectMonitorList(deviceLog);
     }
 
+    /***
+     * 日志列表
+     * @return
+     */
+    @Override
+    public List<DeviceLog> selectDeviceLogList(DeviceLog deviceLog) {
+        return deviceLogMapper.selectDeviceLogList(deviceLog);
+    }
 }
diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceLogMapper.xml b/springboot/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceLogMapper.xml
index 540fd56c..ced8cb75 100644
--- a/springboot/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceLogMapper.xml
+++ b/springboot/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceLogMapper.xml
@@ -143,4 +143,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from iot_device_log where serial_number = #{deviceNumber}
     </delete>
 
+    <select id="selectDeviceLogList" parameterType="com.fastbee.iot.domain.DeviceLog" resultMap="DeviceLogResult">
+        <include refid="selectDeviceLogVo"/>
+        <where>
+            <if test="isMonitor != null"> and is_monitor = #{isMonitor}</if>
+            <if test="deviceId != null and deviceId !=0"> and device_id = #{deviceId}</if>
+            <if test="serialNumber != null and serialNumber !=''"> and serial_number = #{serialNumber}</if>
+            <if test="logType != null "> and log_type = #{logType}</if>
+            <if test="identity != null  and identity != ''"> and identity like concat('%', #{identity}, '%')</if>
+        </where>
+        order by create_time desc
+    </select>
+
 </mapper>