diff --git a/os-ems/src/main/java/com/os/ems/base/mapper/EmsBaseMonitorInfoMapper.java b/os-ems/src/main/java/com/os/ems/base/mapper/EmsBaseMonitorInfoMapper.java
index 5683276..5e56dab 100644
--- a/os-ems/src/main/java/com/os/ems/base/mapper/EmsBaseMonitorInfoMapper.java
+++ b/os-ems/src/main/java/com/os/ems/base/mapper/EmsBaseMonitorInfoMapper.java
@@ -2,6 +2,7 @@ package com.os.ems.base.mapper;
 
 import java.util.List;
 import com.os.ems.base.domain.EmsBaseMonitorInfo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 计量设备信息Mapper接口
@@ -65,4 +66,11 @@ public interface EmsBaseMonitorInfoMapper
      * @return
      */
     public String selectEmsBaseMonitorTypeByMonitorCode(String monitorCode);
+    
+    /**
+     * 根据设备编码列表查询设备信息
+     * @param monitorCodes 设备编码列表
+     * @return 设备信息列表
+     */
+    public List<EmsBaseMonitorInfo> selectMonitorInfoByCodes(@Param("monitorCodes") List<String> monitorCodes);
 }
diff --git a/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordAlarmDataMapper.java b/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordAlarmDataMapper.java
index 3a77070..f551968 100644
--- a/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordAlarmDataMapper.java
+++ b/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordAlarmDataMapper.java
@@ -1,7 +1,9 @@
 package com.os.ems.record.mapper;
 
+import java.util.Date;
 import java.util.List;
 import com.os.ems.record.domain.EmsRecordAlarmData;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 异常数据记录Mapper接口
@@ -58,4 +60,12 @@ public interface EmsRecordAlarmDataMapper
      * @return 结果
      */
     public int deleteEmsRecordAlarmDataByObjIds(Long[] objIds);
+    
+    /**
+     * 查询最近时间内的异常数据
+     * 
+     * @param fiveMinutesAgo 开始时间
+     * @return 异常数据列表
+     */
+    public List<EmsRecordAlarmData> selectRecentAlarmData(@Param("fiveMinutesAgo") Date fiveMinutesAgo);
 }
diff --git a/os-ems/src/main/resources/mapper/ems/base/EmsBaseEnergyTypeMapper.xml b/os-ems/src/main/resources/mapper/ems/base/EmsBaseEnergyTypeMapper.xml
index 374827e..9b6dc8b 100644
--- a/os-ems/src/main/resources/mapper/ems/base/EmsBaseEnergyTypeMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/base/EmsBaseEnergyTypeMapper.xml
@@ -4,6 +4,13 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.os.ems.base.mapper.EmsBaseEnergyTypeMapper">
 
+    <!-- 启用二级缓存 -->
+    <cache 
+        eviction="LRU" 
+        flushInterval="7200000" 
+        size="500" 
+        readOnly="true"/>
+
     <resultMap type="EmsBaseEnergyType" id="EmsBaseEnergyTypeResult">
         <result property="objId" column="obj_id"/>
         <result property="energyTypeId" column="energy_type_id"/>
diff --git a/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorInfoMapper.xml b/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorInfoMapper.xml
index 2f7bd12..24dd084 100644
--- a/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorInfoMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorInfoMapper.xml
@@ -3,6 +3,13 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.os.ems.base.mapper.EmsBaseMonitorInfoMapper">
+
+    <!-- 启用二级缓存 -->
+    <cache 
+        eviction="LRU" 
+        flushInterval="3600000" 
+        size="1000" 
+        readOnly="true"/>
     
     <resultMap type="EmsBaseMonitorInfo" id="EmsBaseMonitorInfoResult">
         <result property="objId"    column="obj_id"    />
@@ -171,4 +178,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{objId}
         </foreach>
     </delete>
+    
+    <!-- 根据设备编码列表查询设备信息 -->
+    <select id="selectMonitorInfoByCodes" resultMap="EmsBaseMonitorInfoResult">
+        <include refid="selectEmsBaseMonitorInfoVo"/>
+        WHERE monitor_code IN
+        <foreach collection="monitorCodes" item="monitorCode" open="(" separator="," close=")">
+            #{monitorCode}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml
index 8640756..d767e14 100644
--- a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml
@@ -139,4 +139,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{objId}
         </foreach>
     </delete>
+
+    <!-- 查询最近时间内的异常数据 -->
+    <select id="selectRecentAlarmData" parameterType="java.util.Date" resultMap="EmsRecordAlarmDataResult">
+        SELECT rad.obj_id,
+               rad.monitor_id,
+               rad.collect_device_id,
+               rad.collect_time,
+               rad.alarm_type,
+               rad.alarm_status,
+               rad.alarm_data,
+               rad.operation_name,
+               rad.operation_time,
+               rad.cause,
+               rad.create_by,
+               rad.create_time,
+               rad.update_by,
+               rad.update_time,
+               rad.notify_user
+        FROM ems_record_alarm_data rad
+        WHERE rad.alarm_status = 1
+          AND rad.alarm_type = 0
+          AND rad.create_time >= #{fiveMinutesAgo}
+    </select>
 </mapper>
diff --git a/os-quartz/src/main/java/com/os/quartz/task/EMSTask.java b/os-quartz/src/main/java/com/os/quartz/task/EMSTask.java
index 92f1238..3725027 100644
--- a/os-quartz/src/main/java/com/os/quartz/task/EMSTask.java
+++ b/os-quartz/src/main/java/com/os/quartz/task/EMSTask.java
@@ -23,24 +23,11 @@ public class EMSTask {
     private IEmsRecordAlarmDataService emsRecordAlarmDataService;
 
     /**
-     * 采集设备告警定时任务
+     * 物联网数据阈值检查定时任务
+     * 已改用@Scheduled注解实现，此方法已废弃
      */
-    public void collectDeviceAlarmsTask() {
-        emsRecordAlarmDataService.collectDeviceAlarmsTask();
-    }
-
-    /**
-     * 超过电阈值定时任务
-     */
-    public void exceedDnbThresholdAlarmsTask() {
-        emsRecordAlarmDataService.exceedDnbThresholdAlarmsTask();
-    }
-
-    /**
-     * 小时耗量告警定时任务
-     */
-    public void hourlyConsumptionAlarmsTask() {
-        emsRecordAlarmDataService.hourlyConsumptionAlarmsTask();
-    }
+    // public void checkIotenvThresholdAlarms() {
+    //     emsRecordAlarmDataService.checkIotenvThresholdAlarms();
+    // }
 
 }