diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 117822b..06a9654 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -181,5 +181,12 @@
         return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
 
     }
+
+    @PostMapping("/test")
+    @ResponseBody
+    public void test( ) {
+        iAlarmRecordsService.processOffline();
+    }
+
 }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 117822b..06a9654 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -181,5 +181,12 @@
         return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
 
     }
+
+    @PostMapping("/test")
+    @ResponseBody
+    public void test( ) {
+        iAlarmRecordsService.processOffline();
+    }
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 59de661..594aeb7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -46,5 +46,5 @@
 
     List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
-    List<Map<String, Object>> getOfflineDevices();
+    List<OffDeviceDTO> getOfflineDevices();
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 117822b..06a9654 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -181,5 +181,12 @@
         return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
 
     }
+
+    @PostMapping("/test")
+    @ResponseBody
+    public void test( ) {
+        iAlarmRecordsService.processOffline();
+    }
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 59de661..594aeb7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -46,5 +46,5 @@
 
     List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
-    List<Map<String, Object>> getOfflineDevices();
+    List<OffDeviceDTO> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index bab7f57..1149977 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -83,7 +83,9 @@
             bt.TYPE_NAME AS devTypeName,
             sd.full_name as deptName,
             lr.DEPTID as deptid,
-            rd.POSITION
+            rd.POSITION,
+            rd.id,
+            ay.ALARM_TYPE
         FROM
             alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -95,6 +97,7 @@
             AND lr.VALID =1
             LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
             LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
         where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -129,29 +132,36 @@
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
         SELECT
-            rd.DEVCODE,rd.ALARM_TYPE_ID,
-            rd.ALARM_CONTENT,rd.ALARM_CONTENT,
-            rd.ALARM_TIME,rd.PROCESS_STATUS,
+            rd.id,
+            rd.DEVCODE,
+            ay.ALARM_TYPE,
+            rd.ALARM_CONTENT,
+            rd.ALARM_MSG,
+            rd.ALARM_TIME,
+            rd.PROCESS_STATUS,
             bt.TYPE_NAME AS devTypeName,
-            rd.POSITION
-            ar.CANCEL_TIME,
-            sd.full_name as deptName,
-            lr.DEPTID as deptid,
-            TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.CANCEL_TIME) as cancelDuration,
-            bp.`NAME` as manufactureName
+            rd.POSITION, rd.CANCEL_TIME,
+            sd.full_name AS deptName,
+            lr.DEPTID AS deptid,
+            TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
+            bm.`NAME` AS manufactureName
         FROM
-        alarm_records rd
+            alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
             LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
             LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
             AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
+            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+            AND lr.type = bl.type
             AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
-            LEFT JOIN bus_manufacturer bm  ON bm.id = bp.MANUFACTURER_ID
-        where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
+            AND lr.VALID = 1
+            LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+            LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID
+            LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 0
+            AND rd.EXCEPTION_TYPE = 1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -430,38 +440,46 @@
     </select>
 
 
-    <select id="getOfflineDevices" resultType="java.util.Map">
-        WITH device_temp AS (
-            SELECT
-                bd.id,
-                bd.DEVCODE,
-                bd.DEVICE_TYPE,
-                bd.WATCH_OBJECT
-            FROM
-                bus_device bd
-            WHERE
-                bd.VALID = 1
-              AND bd.ONLINE_STATE > 0
-                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
-                or bd.LOGTIME is null)
-        ), device_off as (SELECT
-                              dt.DEVCODE,
-                              dt.DEVICE_TYPE,
-                              bv.tagNumber,
-                              bv.ledgerCode,
-                              bdt.TYPE_NAME,
-                              bv.place
-                          FROM
-                              device_temp dt
-                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                  AND bl.type = dt.WATCH_OBJECT
-                                  AND bl.valid = 1
-                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
-                                  AND bv.type = bl.type
-                                  AND bv.valid = 1
-                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+    <select id="getOfflineDevices" resultType="com.casic.missiles.modular.alarm.dto.OffDeviceDTO">
 
-        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+        WITH device_temp AS (
+        SELECT
+        bd.id,
+        bd.DEVCODE,
+        bd.DEVICE_TYPE,
+        bd.WATCH_OBJECT,
+        bd.PRODUCT_ID
+        FROM
+        bus_device bd
+        WHERE
+        bd.VALID = 1
+        AND bd.ONLINE_STATE > 0
+        and (bd.LOGTIME  <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+        or bd.LOGTIME is null)
+        ), device_off as (SELECT
+        dt.DEVCODE,
+        dt.DEVICE_TYPE,
+        bv.tagNumber,
+        bv.ledgerCode,
+        bdt.TYPE_NAME,
+        bv.place,
+        au.ALARM_TYPE_ID,
+        au.ALARM_LEVEL_ID,
+        au.ALARM_THRESHOLD,
+        ae.ALARM_TYPE
+
+        FROM
+        device_temp dt
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+        AND bl.type = dt.WATCH_OBJECT
+        AND bl.valid = 1
+        JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+        AND bv.type = bl.type
+        AND bv.valid = 1
+        JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE
+        JOIN alarm_rule au on au.PRODUCT_ID=dt.PRODUCT_ID and au.STATE=1 and au.ALARM_THRESHOLD='OffLine'
+        join alarm_type ae on ae.id= au.ALARM_TYPE_ID)
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place,t.ALARM_TYPE_ID,t.ALARM_LEVEL_ID,t.ALARM_THRESHOLD,t.ALARM_TYPE as alarmTypeName from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1  and ar.STATUS=1)
     </select>
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 117822b..06a9654 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -181,5 +181,12 @@
         return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
 
     }
+
+    @PostMapping("/test")
+    @ResponseBody
+    public void test( ) {
+        iAlarmRecordsService.processOffline();
+    }
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 59de661..594aeb7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -46,5 +46,5 @@
 
     List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
-    List<Map<String, Object>> getOfflineDevices();
+    List<OffDeviceDTO> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index bab7f57..1149977 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -83,7 +83,9 @@
             bt.TYPE_NAME AS devTypeName,
             sd.full_name as deptName,
             lr.DEPTID as deptid,
-            rd.POSITION
+            rd.POSITION,
+            rd.id,
+            ay.ALARM_TYPE
         FROM
             alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -95,6 +97,7 @@
             AND lr.VALID =1
             LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
             LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
         where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -129,29 +132,36 @@
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
         SELECT
-            rd.DEVCODE,rd.ALARM_TYPE_ID,
-            rd.ALARM_CONTENT,rd.ALARM_CONTENT,
-            rd.ALARM_TIME,rd.PROCESS_STATUS,
+            rd.id,
+            rd.DEVCODE,
+            ay.ALARM_TYPE,
+            rd.ALARM_CONTENT,
+            rd.ALARM_MSG,
+            rd.ALARM_TIME,
+            rd.PROCESS_STATUS,
             bt.TYPE_NAME AS devTypeName,
-            rd.POSITION
-            ar.CANCEL_TIME,
-            sd.full_name as deptName,
-            lr.DEPTID as deptid,
-            TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.CANCEL_TIME) as cancelDuration,
-            bp.`NAME` as manufactureName
+            rd.POSITION, rd.CANCEL_TIME,
+            sd.full_name AS deptName,
+            lr.DEPTID AS deptid,
+            TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
+            bm.`NAME` AS manufactureName
         FROM
-        alarm_records rd
+            alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
             LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
             LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
             AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
+            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+            AND lr.type = bl.type
             AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
-            LEFT JOIN bus_manufacturer bm  ON bm.id = bp.MANUFACTURER_ID
-        where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
+            AND lr.VALID = 1
+            LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+            LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID
+            LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 0
+            AND rd.EXCEPTION_TYPE = 1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -430,38 +440,46 @@
     </select>
 
 
-    <select id="getOfflineDevices" resultType="java.util.Map">
-        WITH device_temp AS (
-            SELECT
-                bd.id,
-                bd.DEVCODE,
-                bd.DEVICE_TYPE,
-                bd.WATCH_OBJECT
-            FROM
-                bus_device bd
-            WHERE
-                bd.VALID = 1
-              AND bd.ONLINE_STATE > 0
-                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
-                or bd.LOGTIME is null)
-        ), device_off as (SELECT
-                              dt.DEVCODE,
-                              dt.DEVICE_TYPE,
-                              bv.tagNumber,
-                              bv.ledgerCode,
-                              bdt.TYPE_NAME,
-                              bv.place
-                          FROM
-                              device_temp dt
-                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                  AND bl.type = dt.WATCH_OBJECT
-                                  AND bl.valid = 1
-                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
-                                  AND bv.type = bl.type
-                                  AND bv.valid = 1
-                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+    <select id="getOfflineDevices" resultType="com.casic.missiles.modular.alarm.dto.OffDeviceDTO">
 
-        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+        WITH device_temp AS (
+        SELECT
+        bd.id,
+        bd.DEVCODE,
+        bd.DEVICE_TYPE,
+        bd.WATCH_OBJECT,
+        bd.PRODUCT_ID
+        FROM
+        bus_device bd
+        WHERE
+        bd.VALID = 1
+        AND bd.ONLINE_STATE > 0
+        and (bd.LOGTIME  <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+        or bd.LOGTIME is null)
+        ), device_off as (SELECT
+        dt.DEVCODE,
+        dt.DEVICE_TYPE,
+        bv.tagNumber,
+        bv.ledgerCode,
+        bdt.TYPE_NAME,
+        bv.place,
+        au.ALARM_TYPE_ID,
+        au.ALARM_LEVEL_ID,
+        au.ALARM_THRESHOLD,
+        ae.ALARM_TYPE
+
+        FROM
+        device_temp dt
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+        AND bl.type = dt.WATCH_OBJECT
+        AND bl.valid = 1
+        JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+        AND bv.type = bl.type
+        AND bv.valid = 1
+        JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE
+        JOIN alarm_rule au on au.PRODUCT_ID=dt.PRODUCT_ID and au.STATE=1 and au.ALARM_THRESHOLD='OffLine'
+        join alarm_type ae on ae.id= au.ALARM_TYPE_ID)
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place,t.ALARM_TYPE_ID,t.ALARM_LEVEL_ID,t.ALARM_THRESHOLD,t.ALARM_TYPE as alarmTypeName from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1  and ar.STATUS=1)
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index 2e5d8dc..d43c464 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -6,6 +6,9 @@
 @Data
 public class DeviceAlarmResponseDTO {
 
+    @ApiModelProperty("报警id")
+    private Long id;
+
     @ApiModelProperty("设备编号")
     private String devCode;
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 117822b..06a9654 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -181,5 +181,12 @@
         return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
 
     }
+
+    @PostMapping("/test")
+    @ResponseBody
+    public void test( ) {
+        iAlarmRecordsService.processOffline();
+    }
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 59de661..594aeb7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -46,5 +46,5 @@
 
     List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
-    List<Map<String, Object>> getOfflineDevices();
+    List<OffDeviceDTO> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index bab7f57..1149977 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -83,7 +83,9 @@
             bt.TYPE_NAME AS devTypeName,
             sd.full_name as deptName,
             lr.DEPTID as deptid,
-            rd.POSITION
+            rd.POSITION,
+            rd.id,
+            ay.ALARM_TYPE
         FROM
             alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -95,6 +97,7 @@
             AND lr.VALID =1
             LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
             LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
         where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -129,29 +132,36 @@
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
         SELECT
-            rd.DEVCODE,rd.ALARM_TYPE_ID,
-            rd.ALARM_CONTENT,rd.ALARM_CONTENT,
-            rd.ALARM_TIME,rd.PROCESS_STATUS,
+            rd.id,
+            rd.DEVCODE,
+            ay.ALARM_TYPE,
+            rd.ALARM_CONTENT,
+            rd.ALARM_MSG,
+            rd.ALARM_TIME,
+            rd.PROCESS_STATUS,
             bt.TYPE_NAME AS devTypeName,
-            rd.POSITION
-            ar.CANCEL_TIME,
-            sd.full_name as deptName,
-            lr.DEPTID as deptid,
-            TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.CANCEL_TIME) as cancelDuration,
-            bp.`NAME` as manufactureName
+            rd.POSITION, rd.CANCEL_TIME,
+            sd.full_name AS deptName,
+            lr.DEPTID AS deptid,
+            TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
+            bm.`NAME` AS manufactureName
         FROM
-        alarm_records rd
+            alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
             LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
             LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
             AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
+            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+            AND lr.type = bl.type
             AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
-            LEFT JOIN bus_manufacturer bm  ON bm.id = bp.MANUFACTURER_ID
-        where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
+            AND lr.VALID = 1
+            LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+            LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID
+            LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 0
+            AND rd.EXCEPTION_TYPE = 1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -430,38 +440,46 @@
     </select>
 
 
-    <select id="getOfflineDevices" resultType="java.util.Map">
-        WITH device_temp AS (
-            SELECT
-                bd.id,
-                bd.DEVCODE,
-                bd.DEVICE_TYPE,
-                bd.WATCH_OBJECT
-            FROM
-                bus_device bd
-            WHERE
-                bd.VALID = 1
-              AND bd.ONLINE_STATE > 0
-                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
-                or bd.LOGTIME is null)
-        ), device_off as (SELECT
-                              dt.DEVCODE,
-                              dt.DEVICE_TYPE,
-                              bv.tagNumber,
-                              bv.ledgerCode,
-                              bdt.TYPE_NAME,
-                              bv.place
-                          FROM
-                              device_temp dt
-                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                  AND bl.type = dt.WATCH_OBJECT
-                                  AND bl.valid = 1
-                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
-                                  AND bv.type = bl.type
-                                  AND bv.valid = 1
-                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+    <select id="getOfflineDevices" resultType="com.casic.missiles.modular.alarm.dto.OffDeviceDTO">
 
-        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+        WITH device_temp AS (
+        SELECT
+        bd.id,
+        bd.DEVCODE,
+        bd.DEVICE_TYPE,
+        bd.WATCH_OBJECT,
+        bd.PRODUCT_ID
+        FROM
+        bus_device bd
+        WHERE
+        bd.VALID = 1
+        AND bd.ONLINE_STATE > 0
+        and (bd.LOGTIME  <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+        or bd.LOGTIME is null)
+        ), device_off as (SELECT
+        dt.DEVCODE,
+        dt.DEVICE_TYPE,
+        bv.tagNumber,
+        bv.ledgerCode,
+        bdt.TYPE_NAME,
+        bv.place,
+        au.ALARM_TYPE_ID,
+        au.ALARM_LEVEL_ID,
+        au.ALARM_THRESHOLD,
+        ae.ALARM_TYPE
+
+        FROM
+        device_temp dt
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+        AND bl.type = dt.WATCH_OBJECT
+        AND bl.valid = 1
+        JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+        AND bv.type = bl.type
+        AND bv.valid = 1
+        JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE
+        JOIN alarm_rule au on au.PRODUCT_ID=dt.PRODUCT_ID and au.STATE=1 and au.ALARM_THRESHOLD='OffLine'
+        join alarm_type ae on ae.id= au.ALARM_TYPE_ID)
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place,t.ALARM_TYPE_ID,t.ALARM_LEVEL_ID,t.ALARM_THRESHOLD,t.ALARM_TYPE as alarmTypeName from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1  and ar.STATUS=1)
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index 2e5d8dc..d43c464 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -6,6 +6,9 @@
 @Data
 public class DeviceAlarmResponseDTO {
 
+    @ApiModelProperty("报警id")
+    private Long id;
+
     @ApiModelProperty("设备编号")
     private String devCode;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
new file mode 100644
index 0000000..57b7932
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import lombok.Data;
+
+@Data
+public class OffDeviceDTO {
+
+
+    private String devcode;
+    private String deviceType;
+    private String tagNumber;
+    private String ledgerCode;
+    private String place;
+    private Long alarmTypeId;
+    private String alarmTypeName;
+    private String alarmThreshold;
+    private Long alarmLevelId;
+
+
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 117822b..06a9654 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -181,5 +181,12 @@
         return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
 
     }
+
+    @PostMapping("/test")
+    @ResponseBody
+    public void test( ) {
+        iAlarmRecordsService.processOffline();
+    }
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 59de661..594aeb7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -46,5 +46,5 @@
 
     List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
-    List<Map<String, Object>> getOfflineDevices();
+    List<OffDeviceDTO> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index bab7f57..1149977 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -83,7 +83,9 @@
             bt.TYPE_NAME AS devTypeName,
             sd.full_name as deptName,
             lr.DEPTID as deptid,
-            rd.POSITION
+            rd.POSITION,
+            rd.id,
+            ay.ALARM_TYPE
         FROM
             alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -95,6 +97,7 @@
             AND lr.VALID =1
             LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
             LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
         where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -129,29 +132,36 @@
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
         SELECT
-            rd.DEVCODE,rd.ALARM_TYPE_ID,
-            rd.ALARM_CONTENT,rd.ALARM_CONTENT,
-            rd.ALARM_TIME,rd.PROCESS_STATUS,
+            rd.id,
+            rd.DEVCODE,
+            ay.ALARM_TYPE,
+            rd.ALARM_CONTENT,
+            rd.ALARM_MSG,
+            rd.ALARM_TIME,
+            rd.PROCESS_STATUS,
             bt.TYPE_NAME AS devTypeName,
-            rd.POSITION
-            ar.CANCEL_TIME,
-            sd.full_name as deptName,
-            lr.DEPTID as deptid,
-            TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.CANCEL_TIME) as cancelDuration,
-            bp.`NAME` as manufactureName
+            rd.POSITION, rd.CANCEL_TIME,
+            sd.full_name AS deptName,
+            lr.DEPTID AS deptid,
+            TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
+            bm.`NAME` AS manufactureName
         FROM
-        alarm_records rd
+            alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
             LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
             LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
             AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
+            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+            AND lr.type = bl.type
             AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
-            LEFT JOIN bus_manufacturer bm  ON bm.id = bp.MANUFACTURER_ID
-        where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
+            AND lr.VALID = 1
+            LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+            LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID
+            LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 0
+            AND rd.EXCEPTION_TYPE = 1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -430,38 +440,46 @@
     </select>
 
 
-    <select id="getOfflineDevices" resultType="java.util.Map">
-        WITH device_temp AS (
-            SELECT
-                bd.id,
-                bd.DEVCODE,
-                bd.DEVICE_TYPE,
-                bd.WATCH_OBJECT
-            FROM
-                bus_device bd
-            WHERE
-                bd.VALID = 1
-              AND bd.ONLINE_STATE > 0
-                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
-                or bd.LOGTIME is null)
-        ), device_off as (SELECT
-                              dt.DEVCODE,
-                              dt.DEVICE_TYPE,
-                              bv.tagNumber,
-                              bv.ledgerCode,
-                              bdt.TYPE_NAME,
-                              bv.place
-                          FROM
-                              device_temp dt
-                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                  AND bl.type = dt.WATCH_OBJECT
-                                  AND bl.valid = 1
-                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
-                                  AND bv.type = bl.type
-                                  AND bv.valid = 1
-                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+    <select id="getOfflineDevices" resultType="com.casic.missiles.modular.alarm.dto.OffDeviceDTO">
 
-        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+        WITH device_temp AS (
+        SELECT
+        bd.id,
+        bd.DEVCODE,
+        bd.DEVICE_TYPE,
+        bd.WATCH_OBJECT,
+        bd.PRODUCT_ID
+        FROM
+        bus_device bd
+        WHERE
+        bd.VALID = 1
+        AND bd.ONLINE_STATE > 0
+        and (bd.LOGTIME  <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+        or bd.LOGTIME is null)
+        ), device_off as (SELECT
+        dt.DEVCODE,
+        dt.DEVICE_TYPE,
+        bv.tagNumber,
+        bv.ledgerCode,
+        bdt.TYPE_NAME,
+        bv.place,
+        au.ALARM_TYPE_ID,
+        au.ALARM_LEVEL_ID,
+        au.ALARM_THRESHOLD,
+        ae.ALARM_TYPE
+
+        FROM
+        device_temp dt
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+        AND bl.type = dt.WATCH_OBJECT
+        AND bl.valid = 1
+        JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+        AND bv.type = bl.type
+        AND bv.valid = 1
+        JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE
+        JOIN alarm_rule au on au.PRODUCT_ID=dt.PRODUCT_ID and au.STATE=1 and au.ALARM_THRESHOLD='OffLine'
+        join alarm_type ae on ae.id= au.ALARM_TYPE_ID)
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place,t.ALARM_TYPE_ID,t.ALARM_LEVEL_ID,t.ALARM_THRESHOLD,t.ALARM_TYPE as alarmTypeName from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1  and ar.STATUS=1)
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index 2e5d8dc..d43c464 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -6,6 +6,9 @@
 @Data
 public class DeviceAlarmResponseDTO {
 
+    @ApiModelProperty("报警id")
+    private Long id;
+
     @ApiModelProperty("设备编号")
     private String devCode;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
new file mode 100644
index 0000000..57b7932
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import lombok.Data;
+
+@Data
+public class OffDeviceDTO {
+
+
+    private String devcode;
+    private String deviceType;
+    private String tagNumber;
+    private String ledgerCode;
+    private String place;
+    private Long alarmTypeId;
+    private String alarmTypeName;
+    private String alarmThreshold;
+    private Long alarmLevelId;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index aa8ef86..259f8e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -584,20 +584,20 @@
      */
     @Override
     public void processOffline() {
-        //todo:等报警类型调试完后 完善
-        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        //注意:报警类型一律为“OffLine”
+        List<OffDeviceDTO> offDeviceDTOList = this.baseMapper.getOfflineDevices();
         List<AlarmRecords> alarmRecordsList = new ArrayList<>();
-        for (Map<String, Object> map : mapList) {
-//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
-//                    map.get("ledgerCode").toString(),
-//                    map.get("tagNumber").toString(),
-//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
-//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
-//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
-//                    new Date(),
-//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
-//                    map.get("place").toString(), "1");
-//            alarmRecordsList.add(alarmRecords);
+        for (OffDeviceDTO offDeviceDTO : offDeviceDTOList) {
+            AlarmRecords alarmRecords = new AlarmRecords(offDeviceDTO.getDevcode(),
+                    offDeviceDTO.getLedgerCode(),
+                    offDeviceDTO.getTagNumber(),
+                    offDeviceDTO.getAlarmTypeId(),
+                    offDeviceDTO.getAlarmTypeName(),
+                    offDeviceDTO.getAlarmLevelId(),
+                    new Date(),
+                    offDeviceDTO.getAlarmThreshold(),
+                    offDeviceDTO.getPlace(), "1");
+            alarmRecordsList.add(alarmRecords);
         }
         this.saveBatch(alarmRecordsList);
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 117822b..06a9654 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -181,5 +181,12 @@
         return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
 
     }
+
+    @PostMapping("/test")
+    @ResponseBody
+    public void test( ) {
+        iAlarmRecordsService.processOffline();
+    }
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 59de661..594aeb7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -46,5 +46,5 @@
 
     List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
-    List<Map<String, Object>> getOfflineDevices();
+    List<OffDeviceDTO> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index bab7f57..1149977 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -83,7 +83,9 @@
             bt.TYPE_NAME AS devTypeName,
             sd.full_name as deptName,
             lr.DEPTID as deptid,
-            rd.POSITION
+            rd.POSITION,
+            rd.id,
+            ay.ALARM_TYPE
         FROM
             alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -95,6 +97,7 @@
             AND lr.VALID =1
             LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
             LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
         where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -129,29 +132,36 @@
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
         SELECT
-            rd.DEVCODE,rd.ALARM_TYPE_ID,
-            rd.ALARM_CONTENT,rd.ALARM_CONTENT,
-            rd.ALARM_TIME,rd.PROCESS_STATUS,
+            rd.id,
+            rd.DEVCODE,
+            ay.ALARM_TYPE,
+            rd.ALARM_CONTENT,
+            rd.ALARM_MSG,
+            rd.ALARM_TIME,
+            rd.PROCESS_STATUS,
             bt.TYPE_NAME AS devTypeName,
-            rd.POSITION
-            ar.CANCEL_TIME,
-            sd.full_name as deptName,
-            lr.DEPTID as deptid,
-            TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.CANCEL_TIME) as cancelDuration,
-            bp.`NAME` as manufactureName
+            rd.POSITION, rd.CANCEL_TIME,
+            sd.full_name AS deptName,
+            lr.DEPTID AS deptid,
+            TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
+            bm.`NAME` AS manufactureName
         FROM
-        alarm_records rd
+            alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
             LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
             LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
             AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
+            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+            AND lr.type = bl.type
             AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
-            LEFT JOIN bus_manufacturer bm  ON bm.id = bp.MANUFACTURER_ID
-        where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
+            AND lr.VALID = 1
+            LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+            LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID
+            LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 0
+            AND rd.EXCEPTION_TYPE = 1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -430,38 +440,46 @@
     </select>
 
 
-    <select id="getOfflineDevices" resultType="java.util.Map">
-        WITH device_temp AS (
-            SELECT
-                bd.id,
-                bd.DEVCODE,
-                bd.DEVICE_TYPE,
-                bd.WATCH_OBJECT
-            FROM
-                bus_device bd
-            WHERE
-                bd.VALID = 1
-              AND bd.ONLINE_STATE > 0
-                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
-                or bd.LOGTIME is null)
-        ), device_off as (SELECT
-                              dt.DEVCODE,
-                              dt.DEVICE_TYPE,
-                              bv.tagNumber,
-                              bv.ledgerCode,
-                              bdt.TYPE_NAME,
-                              bv.place
-                          FROM
-                              device_temp dt
-                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                  AND bl.type = dt.WATCH_OBJECT
-                                  AND bl.valid = 1
-                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
-                                  AND bv.type = bl.type
-                                  AND bv.valid = 1
-                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+    <select id="getOfflineDevices" resultType="com.casic.missiles.modular.alarm.dto.OffDeviceDTO">
 
-        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+        WITH device_temp AS (
+        SELECT
+        bd.id,
+        bd.DEVCODE,
+        bd.DEVICE_TYPE,
+        bd.WATCH_OBJECT,
+        bd.PRODUCT_ID
+        FROM
+        bus_device bd
+        WHERE
+        bd.VALID = 1
+        AND bd.ONLINE_STATE > 0
+        and (bd.LOGTIME  <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+        or bd.LOGTIME is null)
+        ), device_off as (SELECT
+        dt.DEVCODE,
+        dt.DEVICE_TYPE,
+        bv.tagNumber,
+        bv.ledgerCode,
+        bdt.TYPE_NAME,
+        bv.place,
+        au.ALARM_TYPE_ID,
+        au.ALARM_LEVEL_ID,
+        au.ALARM_THRESHOLD,
+        ae.ALARM_TYPE
+
+        FROM
+        device_temp dt
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+        AND bl.type = dt.WATCH_OBJECT
+        AND bl.valid = 1
+        JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+        AND bv.type = bl.type
+        AND bv.valid = 1
+        JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE
+        JOIN alarm_rule au on au.PRODUCT_ID=dt.PRODUCT_ID and au.STATE=1 and au.ALARM_THRESHOLD='OffLine'
+        join alarm_type ae on ae.id= au.ALARM_TYPE_ID)
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place,t.ALARM_TYPE_ID,t.ALARM_LEVEL_ID,t.ALARM_THRESHOLD,t.ALARM_TYPE as alarmTypeName from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1  and ar.STATUS=1)
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index 2e5d8dc..d43c464 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -6,6 +6,9 @@
 @Data
 public class DeviceAlarmResponseDTO {
 
+    @ApiModelProperty("报警id")
+    private Long id;
+
     @ApiModelProperty("设备编号")
     private String devCode;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
new file mode 100644
index 0000000..57b7932
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import lombok.Data;
+
+@Data
+public class OffDeviceDTO {
+
+
+    private String devcode;
+    private String deviceType;
+    private String tagNumber;
+    private String ledgerCode;
+    private String place;
+    private Long alarmTypeId;
+    private String alarmTypeName;
+    private String alarmThreshold;
+    private Long alarmLevelId;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index aa8ef86..259f8e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -584,20 +584,20 @@
      */
     @Override
     public void processOffline() {
-        //todo:等报警类型调试完后 完善
-        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        //注意:报警类型一律为“OffLine”
+        List<OffDeviceDTO> offDeviceDTOList = this.baseMapper.getOfflineDevices();
         List<AlarmRecords> alarmRecordsList = new ArrayList<>();
-        for (Map<String, Object> map : mapList) {
-//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
-//                    map.get("ledgerCode").toString(),
-//                    map.get("tagNumber").toString(),
-//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
-//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
-//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
-//                    new Date(),
-//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
-//                    map.get("place").toString(), "1");
-//            alarmRecordsList.add(alarmRecords);
+        for (OffDeviceDTO offDeviceDTO : offDeviceDTOList) {
+            AlarmRecords alarmRecords = new AlarmRecords(offDeviceDTO.getDevcode(),
+                    offDeviceDTO.getLedgerCode(),
+                    offDeviceDTO.getTagNumber(),
+                    offDeviceDTO.getAlarmTypeId(),
+                    offDeviceDTO.getAlarmTypeName(),
+                    offDeviceDTO.getAlarmLevelId(),
+                    new Date(),
+                    offDeviceDTO.getAlarmThreshold(),
+                    offDeviceDTO.getPlace(), "1");
+            alarmRecordsList.add(alarmRecords);
         }
         this.saveBatch(alarmRecordsList);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index 4b6c5fe..3832ab3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -49,6 +49,7 @@
     @PostMapping("/list")
     @ResponseBody
     public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+        //TOdO:需要优化，看实际用到字段返回
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         return ReturnUtil.success(wellMonitorService.list(request, dataScope));
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 117822b..06a9654 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -181,5 +181,12 @@
         return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
 
     }
+
+    @PostMapping("/test")
+    @ResponseBody
+    public void test( ) {
+        iAlarmRecordsService.processOffline();
+    }
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 59de661..594aeb7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -46,5 +46,5 @@
 
     List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
-    List<Map<String, Object>> getOfflineDevices();
+    List<OffDeviceDTO> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index bab7f57..1149977 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -83,7 +83,9 @@
             bt.TYPE_NAME AS devTypeName,
             sd.full_name as deptName,
             lr.DEPTID as deptid,
-            rd.POSITION
+            rd.POSITION,
+            rd.id,
+            ay.ALARM_TYPE
         FROM
             alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -95,6 +97,7 @@
             AND lr.VALID =1
             LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
             LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
         where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -129,29 +132,36 @@
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
         SELECT
-            rd.DEVCODE,rd.ALARM_TYPE_ID,
-            rd.ALARM_CONTENT,rd.ALARM_CONTENT,
-            rd.ALARM_TIME,rd.PROCESS_STATUS,
+            rd.id,
+            rd.DEVCODE,
+            ay.ALARM_TYPE,
+            rd.ALARM_CONTENT,
+            rd.ALARM_MSG,
+            rd.ALARM_TIME,
+            rd.PROCESS_STATUS,
             bt.TYPE_NAME AS devTypeName,
-            rd.POSITION
-            ar.CANCEL_TIME,
-            sd.full_name as deptName,
-            lr.DEPTID as deptid,
-            TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.CANCEL_TIME) as cancelDuration,
-            bp.`NAME` as manufactureName
+            rd.POSITION, rd.CANCEL_TIME,
+            sd.full_name AS deptName,
+            lr.DEPTID AS deptid,
+            TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
+            bm.`NAME` AS manufactureName
         FROM
-        alarm_records rd
+            alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
             LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
             LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
             AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
+            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+            AND lr.type = bl.type
             AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
-            LEFT JOIN bus_manufacturer bm  ON bm.id = bp.MANUFACTURER_ID
-        where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
+            AND lr.VALID = 1
+            LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+            LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID
+            LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 0
+            AND rd.EXCEPTION_TYPE = 1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -430,38 +440,46 @@
     </select>
 
 
-    <select id="getOfflineDevices" resultType="java.util.Map">
-        WITH device_temp AS (
-            SELECT
-                bd.id,
-                bd.DEVCODE,
-                bd.DEVICE_TYPE,
-                bd.WATCH_OBJECT
-            FROM
-                bus_device bd
-            WHERE
-                bd.VALID = 1
-              AND bd.ONLINE_STATE > 0
-                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
-                or bd.LOGTIME is null)
-        ), device_off as (SELECT
-                              dt.DEVCODE,
-                              dt.DEVICE_TYPE,
-                              bv.tagNumber,
-                              bv.ledgerCode,
-                              bdt.TYPE_NAME,
-                              bv.place
-                          FROM
-                              device_temp dt
-                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                  AND bl.type = dt.WATCH_OBJECT
-                                  AND bl.valid = 1
-                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
-                                  AND bv.type = bl.type
-                                  AND bv.valid = 1
-                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+    <select id="getOfflineDevices" resultType="com.casic.missiles.modular.alarm.dto.OffDeviceDTO">
 
-        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+        WITH device_temp AS (
+        SELECT
+        bd.id,
+        bd.DEVCODE,
+        bd.DEVICE_TYPE,
+        bd.WATCH_OBJECT,
+        bd.PRODUCT_ID
+        FROM
+        bus_device bd
+        WHERE
+        bd.VALID = 1
+        AND bd.ONLINE_STATE > 0
+        and (bd.LOGTIME  <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+        or bd.LOGTIME is null)
+        ), device_off as (SELECT
+        dt.DEVCODE,
+        dt.DEVICE_TYPE,
+        bv.tagNumber,
+        bv.ledgerCode,
+        bdt.TYPE_NAME,
+        bv.place,
+        au.ALARM_TYPE_ID,
+        au.ALARM_LEVEL_ID,
+        au.ALARM_THRESHOLD,
+        ae.ALARM_TYPE
+
+        FROM
+        device_temp dt
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+        AND bl.type = dt.WATCH_OBJECT
+        AND bl.valid = 1
+        JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+        AND bv.type = bl.type
+        AND bv.valid = 1
+        JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE
+        JOIN alarm_rule au on au.PRODUCT_ID=dt.PRODUCT_ID and au.STATE=1 and au.ALARM_THRESHOLD='OffLine'
+        join alarm_type ae on ae.id= au.ALARM_TYPE_ID)
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place,t.ALARM_TYPE_ID,t.ALARM_LEVEL_ID,t.ALARM_THRESHOLD,t.ALARM_TYPE as alarmTypeName from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1  and ar.STATUS=1)
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index 2e5d8dc..d43c464 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -6,6 +6,9 @@
 @Data
 public class DeviceAlarmResponseDTO {
 
+    @ApiModelProperty("报警id")
+    private Long id;
+
     @ApiModelProperty("设备编号")
     private String devCode;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
new file mode 100644
index 0000000..57b7932
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import lombok.Data;
+
+@Data
+public class OffDeviceDTO {
+
+
+    private String devcode;
+    private String deviceType;
+    private String tagNumber;
+    private String ledgerCode;
+    private String place;
+    private Long alarmTypeId;
+    private String alarmTypeName;
+    private String alarmThreshold;
+    private Long alarmLevelId;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index aa8ef86..259f8e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -584,20 +584,20 @@
      */
     @Override
     public void processOffline() {
-        //todo:等报警类型调试完后 完善
-        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        //注意:报警类型一律为“OffLine”
+        List<OffDeviceDTO> offDeviceDTOList = this.baseMapper.getOfflineDevices();
         List<AlarmRecords> alarmRecordsList = new ArrayList<>();
-        for (Map<String, Object> map : mapList) {
-//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
-//                    map.get("ledgerCode").toString(),
-//                    map.get("tagNumber").toString(),
-//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
-//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
-//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
-//                    new Date(),
-//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
-//                    map.get("place").toString(), "1");
-//            alarmRecordsList.add(alarmRecords);
+        for (OffDeviceDTO offDeviceDTO : offDeviceDTOList) {
+            AlarmRecords alarmRecords = new AlarmRecords(offDeviceDTO.getDevcode(),
+                    offDeviceDTO.getLedgerCode(),
+                    offDeviceDTO.getTagNumber(),
+                    offDeviceDTO.getAlarmTypeId(),
+                    offDeviceDTO.getAlarmTypeName(),
+                    offDeviceDTO.getAlarmLevelId(),
+                    new Date(),
+                    offDeviceDTO.getAlarmThreshold(),
+                    offDeviceDTO.getPlace(), "1");
+            alarmRecordsList.add(alarmRecords);
         }
         this.saveBatch(alarmRecordsList);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index 4b6c5fe..3832ab3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -49,6 +49,7 @@
     @PostMapping("/list")
     @ResponseBody
     public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+        //TOdO:需要优化，看实际用到字段返回
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         return ReturnUtil.success(wellMonitorService.list(request, dataScope));
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index eb98a0e..e5e9927 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -33,10 +33,10 @@
     List<BusLedger> list(@Param("scope") DataScope dataScope,
                          @Param("request") BusLedgerDTO request);
 
-    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) \n" +
-            "\t\n" +
-            "\tSELECT device.devcode ,\n" +
-            "\tdevice.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
+    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
+            " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
+            " SELECT device.devcode , " +
+            " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
     List<DeviceMonitorDTO> getDeviceList(@Param("ledgerId") Long ledgerId);
 
     List<Map<String, Object>> getWatchData(@Param("tableName") String tableName,

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 117822b..06a9654 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -181,5 +181,12 @@
         return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
 
     }
+
+    @PostMapping("/test")
+    @ResponseBody
+    public void test( ) {
+        iAlarmRecordsService.processOffline();
+    }
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 59de661..594aeb7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -46,5 +46,5 @@
 
     List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
-    List<Map<String, Object>> getOfflineDevices();
+    List<OffDeviceDTO> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index bab7f57..1149977 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -83,7 +83,9 @@
             bt.TYPE_NAME AS devTypeName,
             sd.full_name as deptName,
             lr.DEPTID as deptid,
-            rd.POSITION
+            rd.POSITION,
+            rd.id,
+            ay.ALARM_TYPE
         FROM
             alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -95,6 +97,7 @@
             AND lr.VALID =1
             LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
             LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
         where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -129,29 +132,36 @@
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
         SELECT
-            rd.DEVCODE,rd.ALARM_TYPE_ID,
-            rd.ALARM_CONTENT,rd.ALARM_CONTENT,
-            rd.ALARM_TIME,rd.PROCESS_STATUS,
+            rd.id,
+            rd.DEVCODE,
+            ay.ALARM_TYPE,
+            rd.ALARM_CONTENT,
+            rd.ALARM_MSG,
+            rd.ALARM_TIME,
+            rd.PROCESS_STATUS,
             bt.TYPE_NAME AS devTypeName,
-            rd.POSITION
-            ar.CANCEL_TIME,
-            sd.full_name as deptName,
-            lr.DEPTID as deptid,
-            TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.CANCEL_TIME) as cancelDuration,
-            bp.`NAME` as manufactureName
+            rd.POSITION, rd.CANCEL_TIME,
+            sd.full_name AS deptName,
+            lr.DEPTID AS deptid,
+            TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
+            bm.`NAME` AS manufactureName
         FROM
-        alarm_records rd
+            alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
             LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
             LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
             AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
+            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+            AND lr.type = bl.type
             AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
-            LEFT JOIN bus_manufacturer bm  ON bm.id = bp.MANUFACTURER_ID
-        where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
+            AND lr.VALID = 1
+            LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+            LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID
+            LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 0
+            AND rd.EXCEPTION_TYPE = 1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -430,38 +440,46 @@
     </select>
 
 
-    <select id="getOfflineDevices" resultType="java.util.Map">
-        WITH device_temp AS (
-            SELECT
-                bd.id,
-                bd.DEVCODE,
-                bd.DEVICE_TYPE,
-                bd.WATCH_OBJECT
-            FROM
-                bus_device bd
-            WHERE
-                bd.VALID = 1
-              AND bd.ONLINE_STATE > 0
-                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
-                or bd.LOGTIME is null)
-        ), device_off as (SELECT
-                              dt.DEVCODE,
-                              dt.DEVICE_TYPE,
-                              bv.tagNumber,
-                              bv.ledgerCode,
-                              bdt.TYPE_NAME,
-                              bv.place
-                          FROM
-                              device_temp dt
-                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                  AND bl.type = dt.WATCH_OBJECT
-                                  AND bl.valid = 1
-                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
-                                  AND bv.type = bl.type
-                                  AND bv.valid = 1
-                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+    <select id="getOfflineDevices" resultType="com.casic.missiles.modular.alarm.dto.OffDeviceDTO">
 
-        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+        WITH device_temp AS (
+        SELECT
+        bd.id,
+        bd.DEVCODE,
+        bd.DEVICE_TYPE,
+        bd.WATCH_OBJECT,
+        bd.PRODUCT_ID
+        FROM
+        bus_device bd
+        WHERE
+        bd.VALID = 1
+        AND bd.ONLINE_STATE > 0
+        and (bd.LOGTIME  <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+        or bd.LOGTIME is null)
+        ), device_off as (SELECT
+        dt.DEVCODE,
+        dt.DEVICE_TYPE,
+        bv.tagNumber,
+        bv.ledgerCode,
+        bdt.TYPE_NAME,
+        bv.place,
+        au.ALARM_TYPE_ID,
+        au.ALARM_LEVEL_ID,
+        au.ALARM_THRESHOLD,
+        ae.ALARM_TYPE
+
+        FROM
+        device_temp dt
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+        AND bl.type = dt.WATCH_OBJECT
+        AND bl.valid = 1
+        JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+        AND bv.type = bl.type
+        AND bv.valid = 1
+        JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE
+        JOIN alarm_rule au on au.PRODUCT_ID=dt.PRODUCT_ID and au.STATE=1 and au.ALARM_THRESHOLD='OffLine'
+        join alarm_type ae on ae.id= au.ALARM_TYPE_ID)
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place,t.ALARM_TYPE_ID,t.ALARM_LEVEL_ID,t.ALARM_THRESHOLD,t.ALARM_TYPE as alarmTypeName from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1  and ar.STATUS=1)
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index 2e5d8dc..d43c464 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -6,6 +6,9 @@
 @Data
 public class DeviceAlarmResponseDTO {
 
+    @ApiModelProperty("报警id")
+    private Long id;
+
     @ApiModelProperty("设备编号")
     private String devCode;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
new file mode 100644
index 0000000..57b7932
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import lombok.Data;
+
+@Data
+public class OffDeviceDTO {
+
+
+    private String devcode;
+    private String deviceType;
+    private String tagNumber;
+    private String ledgerCode;
+    private String place;
+    private Long alarmTypeId;
+    private String alarmTypeName;
+    private String alarmThreshold;
+    private Long alarmLevelId;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index aa8ef86..259f8e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -584,20 +584,20 @@
      */
     @Override
     public void processOffline() {
-        //todo:等报警类型调试完后 完善
-        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        //注意:报警类型一律为“OffLine”
+        List<OffDeviceDTO> offDeviceDTOList = this.baseMapper.getOfflineDevices();
         List<AlarmRecords> alarmRecordsList = new ArrayList<>();
-        for (Map<String, Object> map : mapList) {
-//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
-//                    map.get("ledgerCode").toString(),
-//                    map.get("tagNumber").toString(),
-//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
-//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
-//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
-//                    new Date(),
-//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
-//                    map.get("place").toString(), "1");
-//            alarmRecordsList.add(alarmRecords);
+        for (OffDeviceDTO offDeviceDTO : offDeviceDTOList) {
+            AlarmRecords alarmRecords = new AlarmRecords(offDeviceDTO.getDevcode(),
+                    offDeviceDTO.getLedgerCode(),
+                    offDeviceDTO.getTagNumber(),
+                    offDeviceDTO.getAlarmTypeId(),
+                    offDeviceDTO.getAlarmTypeName(),
+                    offDeviceDTO.getAlarmLevelId(),
+                    new Date(),
+                    offDeviceDTO.getAlarmThreshold(),
+                    offDeviceDTO.getPlace(), "1");
+            alarmRecordsList.add(alarmRecords);
         }
         this.saveBatch(alarmRecordsList);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index 4b6c5fe..3832ab3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -49,6 +49,7 @@
     @PostMapping("/list")
     @ResponseBody
     public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+        //TOdO:需要优化，看实际用到字段返回
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         return ReturnUtil.success(wellMonitorService.list(request, dataScope));
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index eb98a0e..e5e9927 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -33,10 +33,10 @@
     List<BusLedger> list(@Param("scope") DataScope dataScope,
                          @Param("request") BusLedgerDTO request);
 
-    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) \n" +
-            "\t\n" +
-            "\tSELECT device.devcode ,\n" +
-            "\tdevice.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
+    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
+            " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
+            " SELECT device.devcode , " +
+            " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
     List<DeviceMonitorDTO> getDeviceList(@Param("ledgerId") Long ledgerId);
 
     List<Map<String, Object>> getWatchData(@Param("tableName") String tableName,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index dfab13d..e0e3020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -15,5 +15,8 @@
     @ApiModelProperty("结束时间")
     private String endTime;
 
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 117822b..06a9654 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -181,5 +181,12 @@
         return ReturnUtil.success(iAlarmRecordsService.viewPlace(requestDTO));
 
     }
+
+    @PostMapping("/test")
+    @ResponseBody
+    public void test( ) {
+        iAlarmRecordsService.processOffline();
+    }
+
 }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
index 59de661..594aeb7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/AlarmRecordsMapper.java
@@ -46,5 +46,5 @@
 
     List<Map<String, Object>> viewPlace(@Param("request") TrackRequestDTO request);
 
-    List<Map<String, Object>> getOfflineDevices();
+    List<OffDeviceDTO> getOfflineDevices();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
index bab7f57..1149977 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRecordsMapper.xml
@@ -83,7 +83,9 @@
             bt.TYPE_NAME AS devTypeName,
             sd.full_name as deptName,
             lr.DEPTID as deptid,
-            rd.POSITION
+            rd.POSITION,
+            rd.id,
+            ay.ALARM_TYPE
         FROM
             alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
@@ -95,6 +97,7 @@
             AND lr.VALID =1
             LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
             LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
         where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
@@ -129,29 +132,36 @@
 
     <select id="deviceAlarmHistoryListPage" resultType="com.casic.missiles.modular.alarm.dto.DeviceAlarmResponseDTO">
         SELECT
-            rd.DEVCODE,rd.ALARM_TYPE_ID,
-            rd.ALARM_CONTENT,rd.ALARM_CONTENT,
-            rd.ALARM_TIME,rd.PROCESS_STATUS,
+            rd.id,
+            rd.DEVCODE,
+            ay.ALARM_TYPE,
+            rd.ALARM_CONTENT,
+            rd.ALARM_MSG,
+            rd.ALARM_TIME,
+            rd.PROCESS_STATUS,
             bt.TYPE_NAME AS devTypeName,
-            rd.POSITION
-            ar.CANCEL_TIME,
-            sd.full_name as deptName,
-            lr.DEPTID as deptid,
-            TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.CANCEL_TIME) as cancelDuration,
-            bp.`NAME` as manufactureName
+            rd.POSITION, rd.CANCEL_TIME,
+            sd.full_name AS deptName,
+            lr.DEPTID AS deptid,
+            TIMESTAMPDIFF( MINUTE, rd.ALARM_TIME, rd.CANCEL_TIME ) AS cancelDuration,
+            bm.`NAME` AS manufactureName
         FROM
-        alarm_records rd
+            alarm_records rd
             LEFT JOIN bus_device bd ON rd.DEVCODE = bd.DEVCODE
             LEFT JOIN base_device_type bt ON bd.DEVICE_TYPE = bt.ID
             LEFT JOIN bus_device_ledger bl ON bd.ID = bl.DEVICE_ID
             AND bl.VALID = 1
-            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID and lr.type=bl.type
+            LEFT JOIN bus_ledger_all_view lr ON lr.ID = bl.LEDGER_ID
+            AND lr.type = bl.type
             AND bl.VALID = 1
-            AND lr.VALID =1
-            LEFT JOIN sys_dept sd  ON sd.id = lr.DEPTID
-            LEFT JOIN base_product bp  ON bp.id = bd.PRODUCT_ID
-            LEFT JOIN bus_manufacturer bm  ON bm.id = bp.MANUFACTURER_ID
-        where rd.STATUS =1 and rd.EXCEPTION_TYPE=1
+            AND lr.VALID = 1
+            LEFT JOIN sys_dept sd ON sd.id = lr.DEPTID
+            LEFT JOIN base_product bp ON bp.id = bd.PRODUCT_ID
+            LEFT JOIN bus_manufacturer bm ON bm.id = bp.MANUFACTURER_ID
+            left join alarm_type ay on ay.id=rd.ALARM_TYPE_ID
+        WHERE
+            rd.STATUS = 0
+            AND rd.EXCEPTION_TYPE = 1
             <if test="request.devCode != null and request.devCode !='' ">
                 and rd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -430,38 +440,46 @@
     </select>
 
 
-    <select id="getOfflineDevices" resultType="java.util.Map">
-        WITH device_temp AS (
-            SELECT
-                bd.id,
-                bd.DEVCODE,
-                bd.DEVICE_TYPE,
-                bd.WATCH_OBJECT
-            FROM
-                bus_device bd
-            WHERE
-                bd.VALID = 1
-              AND bd.ONLINE_STATE > 0
-                and (bd.LOGTIME <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
-                or bd.LOGTIME is null)
-        ), device_off as (SELECT
-                              dt.DEVCODE,
-                              dt.DEVICE_TYPE,
-                              bv.tagNumber,
-                              bv.ledgerCode,
-                              bdt.TYPE_NAME,
-                              bv.place
-                          FROM
-                              device_temp dt
-                                  JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                  AND bl.type = dt.WATCH_OBJECT
-                                  AND bl.valid = 1
-                                  JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
-                                  AND bv.type = bl.type
-                                  AND bv.valid = 1
-                                  JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE)
+    <select id="getOfflineDevices" resultType="com.casic.missiles.modular.alarm.dto.OffDeviceDTO">
 
-        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1 )
+        WITH device_temp AS (
+        SELECT
+        bd.id,
+        bd.DEVCODE,
+        bd.DEVICE_TYPE,
+        bd.WATCH_OBJECT,
+        bd.PRODUCT_ID
+        FROM
+        bus_device bd
+        WHERE
+        bd.VALID = 1
+        AND bd.ONLINE_STATE > 0
+        and (bd.LOGTIME  <![CDATA[ < ]]> DATE_SUB(CURDATE(),INTERVAL 7 DAY)
+        or bd.LOGTIME is null)
+        ), device_off as (SELECT
+        dt.DEVCODE,
+        dt.DEVICE_TYPE,
+        bv.tagNumber,
+        bv.ledgerCode,
+        bdt.TYPE_NAME,
+        bv.place,
+        au.ALARM_TYPE_ID,
+        au.ALARM_LEVEL_ID,
+        au.ALARM_THRESHOLD,
+        ae.ALARM_TYPE
+
+        FROM
+        device_temp dt
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
+        AND bl.type = dt.WATCH_OBJECT
+        AND bl.valid = 1
+        JOIN bus_ledger_all_view bv ON bv.id = bl.LEDGER_ID
+        AND bv.type = bl.type
+        AND bv.valid = 1
+        JOIN base_device_type bdt ON bdt.id = dt.DEVICE_TYPE
+        JOIN alarm_rule au on au.PRODUCT_ID=dt.PRODUCT_ID and au.STATE=1 and au.ALARM_THRESHOLD='OffLine'
+        join alarm_type ae on ae.id= au.ALARM_TYPE_ID)
+        SELECT t.DEVCODE,t.DEVICE_TYPE,t.tagNumber,t.ledgerCode,t.TYPE_NAME,t.place,t.ALARM_TYPE_ID,t.ALARM_LEVEL_ID,t.ALARM_THRESHOLD,t.ALARM_TYPE as alarmTypeName from device_off  t where  not EXISTS(SELECT 1 from alarm_records ar where ar.DEVCODE= t.DEVCODE and ar.EXCEPTION_TYPE=1  and ar.STATUS=1)
     </select>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
index 2e5d8dc..d43c464 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/DeviceAlarmResponseDTO.java
@@ -6,6 +6,9 @@
 @Data
 public class DeviceAlarmResponseDTO {
 
+    @ApiModelProperty("报警id")
+    private Long id;
+
     @ApiModelProperty("设备编号")
     private String devCode;
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
new file mode 100644
index 0000000..57b7932
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/OffDeviceDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.alarm.dto;
+
+import lombok.Data;
+
+@Data
+public class OffDeviceDTO {
+
+
+    private String devcode;
+    private String deviceType;
+    private String tagNumber;
+    private String ledgerCode;
+    private String place;
+    private Long alarmTypeId;
+    private String alarmTypeName;
+    private String alarmThreshold;
+    private Long alarmLevelId;
+
+
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
index aa8ef86..259f8e5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java
@@ -584,20 +584,20 @@
      */
     @Override
     public void processOffline() {
-        //todo:等报警类型调试完后 完善
-        List<Map<String, Object>> mapList = this.baseMapper.getOfflineDevices();
+        //注意:报警类型一律为“OffLine”
+        List<OffDeviceDTO> offDeviceDTOList = this.baseMapper.getOfflineDevices();
         List<AlarmRecords> alarmRecordsList = new ArrayList<>();
-        for (Map<String, Object> map : mapList) {
-//            AlarmRecords alarmRecords = new AlarmRecords(map.get("DEVCODE").toString(),
-//                    map.get("ledgerCode").toString(),
-//                    map.get("tagNumber").toString(),
-//                    alarmRuleResponseDTO.get().getAlarmTypeId(),
-//                    alarmRuleResponseDTO.get().getAlarmTypeName(),
-//                    alarmRuleResponseDTO.get().getAlarmLevelId(),
-//                    new Date(),
-//                    alarmRuleResponseDTO.get().getAlarmThreshold(),
-//                    map.get("place").toString(), "1");
-//            alarmRecordsList.add(alarmRecords);
+        for (OffDeviceDTO offDeviceDTO : offDeviceDTOList) {
+            AlarmRecords alarmRecords = new AlarmRecords(offDeviceDTO.getDevcode(),
+                    offDeviceDTO.getLedgerCode(),
+                    offDeviceDTO.getTagNumber(),
+                    offDeviceDTO.getAlarmTypeId(),
+                    offDeviceDTO.getAlarmTypeName(),
+                    offDeviceDTO.getAlarmLevelId(),
+                    new Date(),
+                    offDeviceDTO.getAlarmThreshold(),
+                    offDeviceDTO.getPlace(), "1");
+            alarmRecordsList.add(alarmRecords);
         }
         this.saveBatch(alarmRecordsList);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
index 4b6c5fe..3832ab3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusWellMonitorController.java
@@ -49,6 +49,7 @@
     @PostMapping("/list")
     @ResponseBody
     public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+        //TOdO:需要优化，看实际用到字段返回
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         return ReturnUtil.success(wellMonitorService.list(request, dataScope));
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
index eb98a0e..e5e9927 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusWellMonitorMapper.java
@@ -33,10 +33,10 @@
     List<BusLedger> list(@Param("scope") DataScope dataScope,
                          @Param("request") BusLedgerDTO request);
 
-    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1)) \n" +
-            "\t\n" +
-            "\tSELECT device.devcode ,\n" +
-            "\tdevice.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
+    @Select("WITH device_tmp as (SELECT bd.devcode,bd.DEVICE_TYPE FROM bus_device bd where " +
+            " EXISTS (SELECT 1 from bus_device_ledger bl where bl.DEVICE_ID= bd.id  and bl.LEDGER_ID=${ledgerId} and TYPE<3 and bl.VALID=1))  " +
+            " SELECT device.devcode , " +
+            " device.DEVICE_TYPE as devTypeId,sd.TYPE_NAME as devTypeName FROM device_tmp device LEFT JOIN base_device_type sd on sd.ID= device.DEVICE_TYPE")
     List<DeviceMonitorDTO> getDeviceList(@Param("ledgerId") Long ledgerId);
 
     List<Map<String, Object>> getWatchData(@Param("tableName") String tableName,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
index dfab13d..e0e3020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/DeviceMonitorRequestDTO.java
@@ -15,5 +15,8 @@
     @ApiModelProperty("结束时间")
     private String endTime;
 
+    @ApiModelProperty("设备编号")
+    private String devCode;
+
 
 }
diff --git a/casic-rest-api/src/main/java/com/casic/missiles/modular/netty/PanTiltChannelHandler.java b/casic-rest-api/src/main/java/com/casic/missiles/modular/netty/PanTiltChannelHandler.java
index 81d0b51..5604d2e 100644
--- a/casic-rest-api/src/main/java/com/casic/missiles/modular/netty/PanTiltChannelHandler.java
+++ b/casic-rest-api/src/main/java/com/casic/missiles/modular/netty/PanTiltChannelHandler.java
@@ -2,13 +2,11 @@
 
 
 import cn.hutool.core.util.ObjectUtil;
-import com.casic.missiles.modular.data.service.impl.DataGasServiceImpl;
 import com.casic.missiles.modular.data.service.impl.DataPanGasServiceImpl;
 import com.casic.missiles.modular.util.RSAUtil;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.util.concurrent.EventExecutorGroup;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;