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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
index 18cf18a..5596e33 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
@@ -33,6 +33,10 @@
                                          @Param("request") OffLineRequestDTO request,
                                          Page<OffLineResponseDTO> page);
 
+    List<OffLineExportDTO> batchExportOffLineList(@Param("deptStrs") String deptStrs,
+                                                  @Param("request") OffLineRequestDTO request);
+
+
     List<ResultDTO> dataReport(@Param("tables") List<ResultDTO> tables);
 
     @Select("SELECT table_name as `name`,time_field as `value` FROM `data_table_names` ")

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
index 18cf18a..5596e33 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
@@ -33,6 +33,10 @@
                                          @Param("request") OffLineRequestDTO request,
                                          Page<OffLineResponseDTO> page);
 
+    List<OffLineExportDTO> batchExportOffLineList(@Param("deptStrs") String deptStrs,
+                                                  @Param("request") OffLineRequestDTO request);
+
+
     List<ResultDTO> dataReport(@Param("tables") List<ResultDTO> tables);
 
     @Select("SELECT table_name as `name`,time_field as `value` FROM `data_table_names` ")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
index 5531cf7..62cc565 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
@@ -181,6 +181,52 @@
 
     </select>
 
+
+    <select id="batchExportOffLineList" resultType="com.casic.missiles.modular.device.dto.OffLineExportDTO">
+
+        SELECT
+        bd.DEVCODE,
+        bv.tagNumber,
+        bv.place,
+        bv.deptid,
+        bm.`NAME` as manufactureName,
+        bd.LOGTIME as lastTime,
+        IF(bd.CELL <![CDATA[  <=  ]]> 10,1,4) as reasons,
+        bt.TYPE_NAME as devTypeName,
+        CASE
+        bd.LOGTIME
+        WHEN NULL THEN
+        NULL ELSE timestampdiff(
+        DAY,
+        LOGTIME,
+        NOW())
+        END AS offDays
+        FROM
+        `bus_device` bd
+        LEFT JOIN bus_device_ledger lr ON lr.DEVICE_ID = bd.ID
+        LEFT JOIN bus_ledger_all_view bv ON lr.LEDGER_ID = bv.ID
+        AND lr.type = bv.type
+        LEFT JOIN base_device_type bt on bt.id = bd.DEVICE_TYPE
+        LEFT JOIN base_product bp on bp.id = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm on bm.id = bp.MANUFACTURER_ID
+        WHERE
+        bd.VALID > 0
+        AND bd.ONLINE_STATE =0
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bv.DEPTID in (${deptStrs})
+        </if>
+        <if test="request.devcode != null and request.devcode !='' ">
+            and  bd.DEVCODE   like concat('%', #{request.devcode}, '%')
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and  bd.DEVICE_TYPE = #{request.devTypeId}
+        </if>
+        <if test="request.reasons == '1'">
+            bd.CELL <![CDATA[  <=  ]]> 10
+        </if>
+
+    </select>
+
     <select id="company" resultType="com.casic.missiles.modular.device.dto.DeviceCompanyDTO">
         WITH device_temp AS (
             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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
index 18cf18a..5596e33 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
@@ -33,6 +33,10 @@
                                          @Param("request") OffLineRequestDTO request,
                                          Page<OffLineResponseDTO> page);
 
+    List<OffLineExportDTO> batchExportOffLineList(@Param("deptStrs") String deptStrs,
+                                                  @Param("request") OffLineRequestDTO request);
+
+
     List<ResultDTO> dataReport(@Param("tables") List<ResultDTO> tables);
 
     @Select("SELECT table_name as `name`,time_field as `value` FROM `data_table_names` ")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
index 5531cf7..62cc565 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
@@ -181,6 +181,52 @@
 
     </select>
 
+
+    <select id="batchExportOffLineList" resultType="com.casic.missiles.modular.device.dto.OffLineExportDTO">
+
+        SELECT
+        bd.DEVCODE,
+        bv.tagNumber,
+        bv.place,
+        bv.deptid,
+        bm.`NAME` as manufactureName,
+        bd.LOGTIME as lastTime,
+        IF(bd.CELL <![CDATA[  <=  ]]> 10,1,4) as reasons,
+        bt.TYPE_NAME as devTypeName,
+        CASE
+        bd.LOGTIME
+        WHEN NULL THEN
+        NULL ELSE timestampdiff(
+        DAY,
+        LOGTIME,
+        NOW())
+        END AS offDays
+        FROM
+        `bus_device` bd
+        LEFT JOIN bus_device_ledger lr ON lr.DEVICE_ID = bd.ID
+        LEFT JOIN bus_ledger_all_view bv ON lr.LEDGER_ID = bv.ID
+        AND lr.type = bv.type
+        LEFT JOIN base_device_type bt on bt.id = bd.DEVICE_TYPE
+        LEFT JOIN base_product bp on bp.id = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm on bm.id = bp.MANUFACTURER_ID
+        WHERE
+        bd.VALID > 0
+        AND bd.ONLINE_STATE =0
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bv.DEPTID in (${deptStrs})
+        </if>
+        <if test="request.devcode != null and request.devcode !='' ">
+            and  bd.DEVCODE   like concat('%', #{request.devcode}, '%')
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and  bd.DEVICE_TYPE = #{request.devTypeId}
+        </if>
+        <if test="request.reasons == '1'">
+            bd.CELL <![CDATA[  <=  ]]> 10
+        </if>
+
+    </select>
+
     <select id="company" resultType="com.casic.missiles.modular.device.dto.DeviceCompanyDTO">
         WITH device_temp AS (
             SELECT
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 73c398a..baff88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -186,10 +186,12 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ar.ALARM_LEVEL,
+        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
-        FROM `alarm_records` ar  where ar.PROCESS_STATUS=7 and ar.`STATUS`=0
+        FROM `alarm_records` ar
+        LEFT JOIN alarm_level_control ac  ON ac.id = ar.ALARM_LEVEL
+        WHERE ar.PROCESS_STATUS=7 and ar.`STATUS`=0
            and  ar.LEDGER_CODE=  #{wellCode}
         <if test="request.begTime != null and request.begTime !='' ">
             and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
index 18cf18a..5596e33 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
@@ -33,6 +33,10 @@
                                          @Param("request") OffLineRequestDTO request,
                                          Page<OffLineResponseDTO> page);
 
+    List<OffLineExportDTO> batchExportOffLineList(@Param("deptStrs") String deptStrs,
+                                                  @Param("request") OffLineRequestDTO request);
+
+
     List<ResultDTO> dataReport(@Param("tables") List<ResultDTO> tables);
 
     @Select("SELECT table_name as `name`,time_field as `value` FROM `data_table_names` ")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
index 5531cf7..62cc565 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
@@ -181,6 +181,52 @@
 
     </select>
 
+
+    <select id="batchExportOffLineList" resultType="com.casic.missiles.modular.device.dto.OffLineExportDTO">
+
+        SELECT
+        bd.DEVCODE,
+        bv.tagNumber,
+        bv.place,
+        bv.deptid,
+        bm.`NAME` as manufactureName,
+        bd.LOGTIME as lastTime,
+        IF(bd.CELL <![CDATA[  <=  ]]> 10,1,4) as reasons,
+        bt.TYPE_NAME as devTypeName,
+        CASE
+        bd.LOGTIME
+        WHEN NULL THEN
+        NULL ELSE timestampdiff(
+        DAY,
+        LOGTIME,
+        NOW())
+        END AS offDays
+        FROM
+        `bus_device` bd
+        LEFT JOIN bus_device_ledger lr ON lr.DEVICE_ID = bd.ID
+        LEFT JOIN bus_ledger_all_view bv ON lr.LEDGER_ID = bv.ID
+        AND lr.type = bv.type
+        LEFT JOIN base_device_type bt on bt.id = bd.DEVICE_TYPE
+        LEFT JOIN base_product bp on bp.id = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm on bm.id = bp.MANUFACTURER_ID
+        WHERE
+        bd.VALID > 0
+        AND bd.ONLINE_STATE =0
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bv.DEPTID in (${deptStrs})
+        </if>
+        <if test="request.devcode != null and request.devcode !='' ">
+            and  bd.DEVCODE   like concat('%', #{request.devcode}, '%')
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and  bd.DEVICE_TYPE = #{request.devTypeId}
+        </if>
+        <if test="request.reasons == '1'">
+            bd.CELL <![CDATA[  <=  ]]> 10
+        </if>
+
+    </select>
+
     <select id="company" resultType="com.casic.missiles.modular.device.dto.DeviceCompanyDTO">
         WITH device_temp AS (
             SELECT
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 73c398a..baff88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -186,10 +186,12 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ar.ALARM_LEVEL,
+        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
-        FROM `alarm_records` ar  where ar.PROCESS_STATUS=7 and ar.`STATUS`=0
+        FROM `alarm_records` ar
+        LEFT JOIN alarm_level_control ac  ON ac.id = ar.ALARM_LEVEL
+        WHERE ar.PROCESS_STATUS=7 and ar.`STATUS`=0
            and  ar.LEDGER_CODE=  #{wellCode}
         <if test="request.begTime != null and request.begTime !='' ">
             and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index a1d06b2..f295c15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@
 import java.util.Date;
 
 @Data
+@ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
     @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("报警时间")

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
index 18cf18a..5596e33 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
@@ -33,6 +33,10 @@
                                          @Param("request") OffLineRequestDTO request,
                                          Page<OffLineResponseDTO> page);
 
+    List<OffLineExportDTO> batchExportOffLineList(@Param("deptStrs") String deptStrs,
+                                                  @Param("request") OffLineRequestDTO request);
+
+
     List<ResultDTO> dataReport(@Param("tables") List<ResultDTO> tables);
 
     @Select("SELECT table_name as `name`,time_field as `value` FROM `data_table_names` ")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
index 5531cf7..62cc565 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
@@ -181,6 +181,52 @@
 
     </select>
 
+
+    <select id="batchExportOffLineList" resultType="com.casic.missiles.modular.device.dto.OffLineExportDTO">
+
+        SELECT
+        bd.DEVCODE,
+        bv.tagNumber,
+        bv.place,
+        bv.deptid,
+        bm.`NAME` as manufactureName,
+        bd.LOGTIME as lastTime,
+        IF(bd.CELL <![CDATA[  <=  ]]> 10,1,4) as reasons,
+        bt.TYPE_NAME as devTypeName,
+        CASE
+        bd.LOGTIME
+        WHEN NULL THEN
+        NULL ELSE timestampdiff(
+        DAY,
+        LOGTIME,
+        NOW())
+        END AS offDays
+        FROM
+        `bus_device` bd
+        LEFT JOIN bus_device_ledger lr ON lr.DEVICE_ID = bd.ID
+        LEFT JOIN bus_ledger_all_view bv ON lr.LEDGER_ID = bv.ID
+        AND lr.type = bv.type
+        LEFT JOIN base_device_type bt on bt.id = bd.DEVICE_TYPE
+        LEFT JOIN base_product bp on bp.id = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm on bm.id = bp.MANUFACTURER_ID
+        WHERE
+        bd.VALID > 0
+        AND bd.ONLINE_STATE =0
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bv.DEPTID in (${deptStrs})
+        </if>
+        <if test="request.devcode != null and request.devcode !='' ">
+            and  bd.DEVCODE   like concat('%', #{request.devcode}, '%')
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and  bd.DEVICE_TYPE = #{request.devTypeId}
+        </if>
+        <if test="request.reasons == '1'">
+            bd.CELL <![CDATA[  <=  ]]> 10
+        </if>
+
+    </select>
+
     <select id="company" resultType="com.casic.missiles.modular.device.dto.DeviceCompanyDTO">
         WITH device_temp AS (
             SELECT
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 73c398a..baff88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -186,10 +186,12 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ar.ALARM_LEVEL,
+        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
-        FROM `alarm_records` ar  where ar.PROCESS_STATUS=7 and ar.`STATUS`=0
+        FROM `alarm_records` ar
+        LEFT JOIN alarm_level_control ac  ON ac.id = ar.ALARM_LEVEL
+        WHERE ar.PROCESS_STATUS=7 and ar.`STATUS`=0
            and  ar.LEDGER_CODE=  #{wellCode}
         <if test="request.begTime != null and request.begTime !='' ">
             and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index a1d06b2..f295c15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@
 import java.util.Date;
 
 @Data
+@ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
     @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("报警时间")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
new file mode 100644
index 0000000..2ea2c69
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+@ExcelIgnoreUnannotated
+public class OffLineExportDTO {
+
+    @ExcelProperty(value = "设备编号", order = 1)
+    private String devcode;
+
+    @ExcelProperty(value = "设备类型", order = 2)
+    private String devTypeName;
+
+    @ExcelProperty(value = "安装位号", order = 4)
+    private String tagNumber;
+
+    @ExcelProperty(value = "最新记录上传时间", order = 7)
+    private String lastTime;
+
+    @ExcelProperty(value = "离线天数", order = 8)
+    private String offDays;
+
+    @ExcelProperty(value = "管理单位", order = 6)
+    private String deptName;
+
+    @ExcelProperty(value = "设备厂家", order = 3)
+    private String manufactureName;
+
+    @ExcelProperty(value = "详细位置", order = 5)
+    private String position;
+
+    @ExcelProperty(value = "离线原因预测", order = 9)
+    private String reasons;
+
+    private Long deptid;
+
+}

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
index 18cf18a..5596e33 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
@@ -33,6 +33,10 @@
                                          @Param("request") OffLineRequestDTO request,
                                          Page<OffLineResponseDTO> page);
 
+    List<OffLineExportDTO> batchExportOffLineList(@Param("deptStrs") String deptStrs,
+                                                  @Param("request") OffLineRequestDTO request);
+
+
     List<ResultDTO> dataReport(@Param("tables") List<ResultDTO> tables);
 
     @Select("SELECT table_name as `name`,time_field as `value` FROM `data_table_names` ")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
index 5531cf7..62cc565 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
@@ -181,6 +181,52 @@
 
     </select>
 
+
+    <select id="batchExportOffLineList" resultType="com.casic.missiles.modular.device.dto.OffLineExportDTO">
+
+        SELECT
+        bd.DEVCODE,
+        bv.tagNumber,
+        bv.place,
+        bv.deptid,
+        bm.`NAME` as manufactureName,
+        bd.LOGTIME as lastTime,
+        IF(bd.CELL <![CDATA[  <=  ]]> 10,1,4) as reasons,
+        bt.TYPE_NAME as devTypeName,
+        CASE
+        bd.LOGTIME
+        WHEN NULL THEN
+        NULL ELSE timestampdiff(
+        DAY,
+        LOGTIME,
+        NOW())
+        END AS offDays
+        FROM
+        `bus_device` bd
+        LEFT JOIN bus_device_ledger lr ON lr.DEVICE_ID = bd.ID
+        LEFT JOIN bus_ledger_all_view bv ON lr.LEDGER_ID = bv.ID
+        AND lr.type = bv.type
+        LEFT JOIN base_device_type bt on bt.id = bd.DEVICE_TYPE
+        LEFT JOIN base_product bp on bp.id = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm on bm.id = bp.MANUFACTURER_ID
+        WHERE
+        bd.VALID > 0
+        AND bd.ONLINE_STATE =0
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bv.DEPTID in (${deptStrs})
+        </if>
+        <if test="request.devcode != null and request.devcode !='' ">
+            and  bd.DEVCODE   like concat('%', #{request.devcode}, '%')
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and  bd.DEVICE_TYPE = #{request.devTypeId}
+        </if>
+        <if test="request.reasons == '1'">
+            bd.CELL <![CDATA[  <=  ]]> 10
+        </if>
+
+    </select>
+
     <select id="company" resultType="com.casic.missiles.modular.device.dto.DeviceCompanyDTO">
         WITH device_temp AS (
             SELECT
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 73c398a..baff88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -186,10 +186,12 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ar.ALARM_LEVEL,
+        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
-        FROM `alarm_records` ar  where ar.PROCESS_STATUS=7 and ar.`STATUS`=0
+        FROM `alarm_records` ar
+        LEFT JOIN alarm_level_control ac  ON ac.id = ar.ALARM_LEVEL
+        WHERE ar.PROCESS_STATUS=7 and ar.`STATUS`=0
            and  ar.LEDGER_CODE=  #{wellCode}
         <if test="request.begTime != null and request.begTime !='' ">
             and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index a1d06b2..f295c15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@
 import java.util.Date;
 
 @Data
+@ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
     @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("报警时间")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
new file mode 100644
index 0000000..2ea2c69
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+@ExcelIgnoreUnannotated
+public class OffLineExportDTO {
+
+    @ExcelProperty(value = "设备编号", order = 1)
+    private String devcode;
+
+    @ExcelProperty(value = "设备类型", order = 2)
+    private String devTypeName;
+
+    @ExcelProperty(value = "安装位号", order = 4)
+    private String tagNumber;
+
+    @ExcelProperty(value = "最新记录上传时间", order = 7)
+    private String lastTime;
+
+    @ExcelProperty(value = "离线天数", order = 8)
+    private String offDays;
+
+    @ExcelProperty(value = "管理单位", order = 6)
+    private String deptName;
+
+    @ExcelProperty(value = "设备厂家", order = 3)
+    private String manufactureName;
+
+    @ExcelProperty(value = "详细位置", order = 5)
+    private String position;
+
+    @ExcelProperty(value = "离线原因预测", order = 9)
+    private String reasons;
+
+    private Long deptid;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
index 6612456..bb3b106 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,6 +8,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,8 +23,8 @@
  * @author zt
  * @since 2024-07-16
  */
-@Getter
-@Setter
+@Data
+@ExcelIgnoreUnannotated
 @TableName("bus_repair_log")
 @ApiModel(value = "BusRepairLog对象", description = "运维管理	")
 public class BusRepairLog implements Serializable {
@@ -38,7 +40,6 @@
     @TableField("DEVCODE")
     private String devcode;
 
-    @ExcelProperty(value = "设备类型", order = 2)
     @ApiModelProperty("设备类型id")
     @TableField("DEVICE_TYPE")
     private Long deviceType;
@@ -81,5 +82,9 @@
     @TableField("TS")
     private Date ts;
 
+    @ExcelProperty(value = "设备类型", order = 2)
+    @ApiModelProperty("设备类型名称")
+    @TableField(exist = false)
+    private String deviceTypeName;
 
 }

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
index 18cf18a..5596e33 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
@@ -33,6 +33,10 @@
                                          @Param("request") OffLineRequestDTO request,
                                          Page<OffLineResponseDTO> page);
 
+    List<OffLineExportDTO> batchExportOffLineList(@Param("deptStrs") String deptStrs,
+                                                  @Param("request") OffLineRequestDTO request);
+
+
     List<ResultDTO> dataReport(@Param("tables") List<ResultDTO> tables);
 
     @Select("SELECT table_name as `name`,time_field as `value` FROM `data_table_names` ")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
index 5531cf7..62cc565 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
@@ -181,6 +181,52 @@
 
     </select>
 
+
+    <select id="batchExportOffLineList" resultType="com.casic.missiles.modular.device.dto.OffLineExportDTO">
+
+        SELECT
+        bd.DEVCODE,
+        bv.tagNumber,
+        bv.place,
+        bv.deptid,
+        bm.`NAME` as manufactureName,
+        bd.LOGTIME as lastTime,
+        IF(bd.CELL <![CDATA[  <=  ]]> 10,1,4) as reasons,
+        bt.TYPE_NAME as devTypeName,
+        CASE
+        bd.LOGTIME
+        WHEN NULL THEN
+        NULL ELSE timestampdiff(
+        DAY,
+        LOGTIME,
+        NOW())
+        END AS offDays
+        FROM
+        `bus_device` bd
+        LEFT JOIN bus_device_ledger lr ON lr.DEVICE_ID = bd.ID
+        LEFT JOIN bus_ledger_all_view bv ON lr.LEDGER_ID = bv.ID
+        AND lr.type = bv.type
+        LEFT JOIN base_device_type bt on bt.id = bd.DEVICE_TYPE
+        LEFT JOIN base_product bp on bp.id = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm on bm.id = bp.MANUFACTURER_ID
+        WHERE
+        bd.VALID > 0
+        AND bd.ONLINE_STATE =0
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bv.DEPTID in (${deptStrs})
+        </if>
+        <if test="request.devcode != null and request.devcode !='' ">
+            and  bd.DEVCODE   like concat('%', #{request.devcode}, '%')
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and  bd.DEVICE_TYPE = #{request.devTypeId}
+        </if>
+        <if test="request.reasons == '1'">
+            bd.CELL <![CDATA[  <=  ]]> 10
+        </if>
+
+    </select>
+
     <select id="company" resultType="com.casic.missiles.modular.device.dto.DeviceCompanyDTO">
         WITH device_temp AS (
             SELECT
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 73c398a..baff88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -186,10 +186,12 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ar.ALARM_LEVEL,
+        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
-        FROM `alarm_records` ar  where ar.PROCESS_STATUS=7 and ar.`STATUS`=0
+        FROM `alarm_records` ar
+        LEFT JOIN alarm_level_control ac  ON ac.id = ar.ALARM_LEVEL
+        WHERE ar.PROCESS_STATUS=7 and ar.`STATUS`=0
            and  ar.LEDGER_CODE=  #{wellCode}
         <if test="request.begTime != null and request.begTime !='' ">
             and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index a1d06b2..f295c15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@
 import java.util.Date;
 
 @Data
+@ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
     @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("报警时间")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
new file mode 100644
index 0000000..2ea2c69
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+@ExcelIgnoreUnannotated
+public class OffLineExportDTO {
+
+    @ExcelProperty(value = "设备编号", order = 1)
+    private String devcode;
+
+    @ExcelProperty(value = "设备类型", order = 2)
+    private String devTypeName;
+
+    @ExcelProperty(value = "安装位号", order = 4)
+    private String tagNumber;
+
+    @ExcelProperty(value = "最新记录上传时间", order = 7)
+    private String lastTime;
+
+    @ExcelProperty(value = "离线天数", order = 8)
+    private String offDays;
+
+    @ExcelProperty(value = "管理单位", order = 6)
+    private String deptName;
+
+    @ExcelProperty(value = "设备厂家", order = 3)
+    private String manufactureName;
+
+    @ExcelProperty(value = "详细位置", order = 5)
+    private String position;
+
+    @ExcelProperty(value = "离线原因预测", order = 9)
+    private String reasons;
+
+    private Long deptid;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
index 6612456..bb3b106 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,6 +8,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,8 +23,8 @@
  * @author zt
  * @since 2024-07-16
  */
-@Getter
-@Setter
+@Data
+@ExcelIgnoreUnannotated
 @TableName("bus_repair_log")
 @ApiModel(value = "BusRepairLog对象", description = "运维管理	")
 public class BusRepairLog implements Serializable {
@@ -38,7 +40,6 @@
     @TableField("DEVCODE")
     private String devcode;
 
-    @ExcelProperty(value = "设备类型", order = 2)
     @ApiModelProperty("设备类型id")
     @TableField("DEVICE_TYPE")
     private Long deviceType;
@@ -81,5 +82,9 @@
     @TableField("TS")
     private Date ts;
 
+    @ExcelProperty(value = "设备类型", order = 2)
+    @ApiModelProperty("设备类型名称")
+    @TableField(exist = false)
+    private String deviceTypeName;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
index 3d371a9..99d9b17 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
@@ -22,6 +22,8 @@
 
     List<DeviceOffDTO> offLine();
 
+    List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO);
+
     List<ResultDTO> company();
 
     Page<OffLineResponseDTO> offLineList(OffLineRequestDTO requestDTO, Page<OffLineResponseDTO> page);

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
index 18cf18a..5596e33 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
@@ -33,6 +33,10 @@
                                          @Param("request") OffLineRequestDTO request,
                                          Page<OffLineResponseDTO> page);
 
+    List<OffLineExportDTO> batchExportOffLineList(@Param("deptStrs") String deptStrs,
+                                                  @Param("request") OffLineRequestDTO request);
+
+
     List<ResultDTO> dataReport(@Param("tables") List<ResultDTO> tables);
 
     @Select("SELECT table_name as `name`,time_field as `value` FROM `data_table_names` ")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
index 5531cf7..62cc565 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
@@ -181,6 +181,52 @@
 
     </select>
 
+
+    <select id="batchExportOffLineList" resultType="com.casic.missiles.modular.device.dto.OffLineExportDTO">
+
+        SELECT
+        bd.DEVCODE,
+        bv.tagNumber,
+        bv.place,
+        bv.deptid,
+        bm.`NAME` as manufactureName,
+        bd.LOGTIME as lastTime,
+        IF(bd.CELL <![CDATA[  <=  ]]> 10,1,4) as reasons,
+        bt.TYPE_NAME as devTypeName,
+        CASE
+        bd.LOGTIME
+        WHEN NULL THEN
+        NULL ELSE timestampdiff(
+        DAY,
+        LOGTIME,
+        NOW())
+        END AS offDays
+        FROM
+        `bus_device` bd
+        LEFT JOIN bus_device_ledger lr ON lr.DEVICE_ID = bd.ID
+        LEFT JOIN bus_ledger_all_view bv ON lr.LEDGER_ID = bv.ID
+        AND lr.type = bv.type
+        LEFT JOIN base_device_type bt on bt.id = bd.DEVICE_TYPE
+        LEFT JOIN base_product bp on bp.id = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm on bm.id = bp.MANUFACTURER_ID
+        WHERE
+        bd.VALID > 0
+        AND bd.ONLINE_STATE =0
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bv.DEPTID in (${deptStrs})
+        </if>
+        <if test="request.devcode != null and request.devcode !='' ">
+            and  bd.DEVCODE   like concat('%', #{request.devcode}, '%')
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and  bd.DEVICE_TYPE = #{request.devTypeId}
+        </if>
+        <if test="request.reasons == '1'">
+            bd.CELL <![CDATA[  <=  ]]> 10
+        </if>
+
+    </select>
+
     <select id="company" resultType="com.casic.missiles.modular.device.dto.DeviceCompanyDTO">
         WITH device_temp AS (
             SELECT
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 73c398a..baff88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -186,10 +186,12 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ar.ALARM_LEVEL,
+        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
-        FROM `alarm_records` ar  where ar.PROCESS_STATUS=7 and ar.`STATUS`=0
+        FROM `alarm_records` ar
+        LEFT JOIN alarm_level_control ac  ON ac.id = ar.ALARM_LEVEL
+        WHERE ar.PROCESS_STATUS=7 and ar.`STATUS`=0
            and  ar.LEDGER_CODE=  #{wellCode}
         <if test="request.begTime != null and request.begTime !='' ">
             and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index a1d06b2..f295c15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@
 import java.util.Date;
 
 @Data
+@ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
     @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("报警时间")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
new file mode 100644
index 0000000..2ea2c69
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+@ExcelIgnoreUnannotated
+public class OffLineExportDTO {
+
+    @ExcelProperty(value = "设备编号", order = 1)
+    private String devcode;
+
+    @ExcelProperty(value = "设备类型", order = 2)
+    private String devTypeName;
+
+    @ExcelProperty(value = "安装位号", order = 4)
+    private String tagNumber;
+
+    @ExcelProperty(value = "最新记录上传时间", order = 7)
+    private String lastTime;
+
+    @ExcelProperty(value = "离线天数", order = 8)
+    private String offDays;
+
+    @ExcelProperty(value = "管理单位", order = 6)
+    private String deptName;
+
+    @ExcelProperty(value = "设备厂家", order = 3)
+    private String manufactureName;
+
+    @ExcelProperty(value = "详细位置", order = 5)
+    private String position;
+
+    @ExcelProperty(value = "离线原因预测", order = 9)
+    private String reasons;
+
+    private Long deptid;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
index 6612456..bb3b106 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,6 +8,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,8 +23,8 @@
  * @author zt
  * @since 2024-07-16
  */
-@Getter
-@Setter
+@Data
+@ExcelIgnoreUnannotated
 @TableName("bus_repair_log")
 @ApiModel(value = "BusRepairLog对象", description = "运维管理	")
 public class BusRepairLog implements Serializable {
@@ -38,7 +40,6 @@
     @TableField("DEVCODE")
     private String devcode;
 
-    @ExcelProperty(value = "设备类型", order = 2)
     @ApiModelProperty("设备类型id")
     @TableField("DEVICE_TYPE")
     private Long deviceType;
@@ -81,5 +82,9 @@
     @TableField("TS")
     private Date ts;
 
+    @ExcelProperty(value = "设备类型", order = 2)
+    @ApiModelProperty("设备类型名称")
+    @TableField(exist = false)
+    private String deviceTypeName;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
index 3d371a9..99d9b17 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
@@ -22,6 +22,8 @@
 
     List<DeviceOffDTO> offLine();
 
+    List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO);
+
     List<ResultDTO> company();
 
     Page<OffLineResponseDTO> offLineList(OffLineRequestDTO requestDTO, Page<OffLineResponseDTO> page);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
index e94d674..17d9b3a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
@@ -97,7 +97,7 @@
                 deptChildIds.add(dept.getId());
                 for (DeviceCompanyDTO dto : deviceCompanyDTOList) {
                     if (deptChildIds.contains(dto.getDeptid())) {
-                        resultDTO.setValue((Long.valueOf(resultDTO.getValue())+dto.getDeviceCount())+"");
+                        resultDTO.setValue((Long.valueOf(resultDTO.getValue()) + dto.getDeviceCount()) + "");
                     }
                 }
                 resultDTOList.add(resultDTO);
@@ -118,6 +118,17 @@
     }
 
     @Override
+    public List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO) {
+
+        List<OffLineExportDTO> exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO);
+        exportDTOList.forEach(dto -> {
+            dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他");
+            dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):"");
+        });
+        return exportDTOList;
+    }
+
+    @Override
     public List<ResultDTO> dataReport() {
         List<ResultDTO> resultDTOList = new ArrayList<>();
         List<ResultDTO> tables = this.baseMapper.dataTables();
@@ -137,4 +148,15 @@
         }
         return deptIdStr;
     }
+
+    public String getDeptNamesByDeptId(Long deptId) {
+        List<Long> deptIds = abstractDeptService.getParentListById(deptId);
+        deptIds.add(deptId);
+        QueryWrapper<Dept> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id", deptIds);
+        queryWrapper.orderByAsc("pids");
+        List<Dept> deptList = abstractDeptService.list(queryWrapper);
+        List<String> nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList());
+        return String.join("/", nameList);
+    }
 }

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
index 18cf18a..5596e33 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
@@ -33,6 +33,10 @@
                                          @Param("request") OffLineRequestDTO request,
                                          Page<OffLineResponseDTO> page);
 
+    List<OffLineExportDTO> batchExportOffLineList(@Param("deptStrs") String deptStrs,
+                                                  @Param("request") OffLineRequestDTO request);
+
+
     List<ResultDTO> dataReport(@Param("tables") List<ResultDTO> tables);
 
     @Select("SELECT table_name as `name`,time_field as `value` FROM `data_table_names` ")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
index 5531cf7..62cc565 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
@@ -181,6 +181,52 @@
 
     </select>
 
+
+    <select id="batchExportOffLineList" resultType="com.casic.missiles.modular.device.dto.OffLineExportDTO">
+
+        SELECT
+        bd.DEVCODE,
+        bv.tagNumber,
+        bv.place,
+        bv.deptid,
+        bm.`NAME` as manufactureName,
+        bd.LOGTIME as lastTime,
+        IF(bd.CELL <![CDATA[  <=  ]]> 10,1,4) as reasons,
+        bt.TYPE_NAME as devTypeName,
+        CASE
+        bd.LOGTIME
+        WHEN NULL THEN
+        NULL ELSE timestampdiff(
+        DAY,
+        LOGTIME,
+        NOW())
+        END AS offDays
+        FROM
+        `bus_device` bd
+        LEFT JOIN bus_device_ledger lr ON lr.DEVICE_ID = bd.ID
+        LEFT JOIN bus_ledger_all_view bv ON lr.LEDGER_ID = bv.ID
+        AND lr.type = bv.type
+        LEFT JOIN base_device_type bt on bt.id = bd.DEVICE_TYPE
+        LEFT JOIN base_product bp on bp.id = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm on bm.id = bp.MANUFACTURER_ID
+        WHERE
+        bd.VALID > 0
+        AND bd.ONLINE_STATE =0
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bv.DEPTID in (${deptStrs})
+        </if>
+        <if test="request.devcode != null and request.devcode !='' ">
+            and  bd.DEVCODE   like concat('%', #{request.devcode}, '%')
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and  bd.DEVICE_TYPE = #{request.devTypeId}
+        </if>
+        <if test="request.reasons == '1'">
+            bd.CELL <![CDATA[  <=  ]]> 10
+        </if>
+
+    </select>
+
     <select id="company" resultType="com.casic.missiles.modular.device.dto.DeviceCompanyDTO">
         WITH device_temp AS (
             SELECT
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 73c398a..baff88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -186,10 +186,12 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ar.ALARM_LEVEL,
+        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
-        FROM `alarm_records` ar  where ar.PROCESS_STATUS=7 and ar.`STATUS`=0
+        FROM `alarm_records` ar
+        LEFT JOIN alarm_level_control ac  ON ac.id = ar.ALARM_LEVEL
+        WHERE ar.PROCESS_STATUS=7 and ar.`STATUS`=0
            and  ar.LEDGER_CODE=  #{wellCode}
         <if test="request.begTime != null and request.begTime !='' ">
             and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index a1d06b2..f295c15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@
 import java.util.Date;
 
 @Data
+@ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
     @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("报警时间")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
new file mode 100644
index 0000000..2ea2c69
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+@ExcelIgnoreUnannotated
+public class OffLineExportDTO {
+
+    @ExcelProperty(value = "设备编号", order = 1)
+    private String devcode;
+
+    @ExcelProperty(value = "设备类型", order = 2)
+    private String devTypeName;
+
+    @ExcelProperty(value = "安装位号", order = 4)
+    private String tagNumber;
+
+    @ExcelProperty(value = "最新记录上传时间", order = 7)
+    private String lastTime;
+
+    @ExcelProperty(value = "离线天数", order = 8)
+    private String offDays;
+
+    @ExcelProperty(value = "管理单位", order = 6)
+    private String deptName;
+
+    @ExcelProperty(value = "设备厂家", order = 3)
+    private String manufactureName;
+
+    @ExcelProperty(value = "详细位置", order = 5)
+    private String position;
+
+    @ExcelProperty(value = "离线原因预测", order = 9)
+    private String reasons;
+
+    private Long deptid;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
index 6612456..bb3b106 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,6 +8,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,8 +23,8 @@
  * @author zt
  * @since 2024-07-16
  */
-@Getter
-@Setter
+@Data
+@ExcelIgnoreUnannotated
 @TableName("bus_repair_log")
 @ApiModel(value = "BusRepairLog对象", description = "运维管理	")
 public class BusRepairLog implements Serializable {
@@ -38,7 +40,6 @@
     @TableField("DEVCODE")
     private String devcode;
 
-    @ExcelProperty(value = "设备类型", order = 2)
     @ApiModelProperty("设备类型id")
     @TableField("DEVICE_TYPE")
     private Long deviceType;
@@ -81,5 +82,9 @@
     @TableField("TS")
     private Date ts;
 
+    @ExcelProperty(value = "设备类型", order = 2)
+    @ApiModelProperty("设备类型名称")
+    @TableField(exist = false)
+    private String deviceTypeName;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
index 3d371a9..99d9b17 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
@@ -22,6 +22,8 @@
 
     List<DeviceOffDTO> offLine();
 
+    List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO);
+
     List<ResultDTO> company();
 
     Page<OffLineResponseDTO> offLineList(OffLineRequestDTO requestDTO, Page<OffLineResponseDTO> page);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
index e94d674..17d9b3a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
@@ -97,7 +97,7 @@
                 deptChildIds.add(dept.getId());
                 for (DeviceCompanyDTO dto : deviceCompanyDTOList) {
                     if (deptChildIds.contains(dto.getDeptid())) {
-                        resultDTO.setValue((Long.valueOf(resultDTO.getValue())+dto.getDeviceCount())+"");
+                        resultDTO.setValue((Long.valueOf(resultDTO.getValue()) + dto.getDeviceCount()) + "");
                     }
                 }
                 resultDTOList.add(resultDTO);
@@ -118,6 +118,17 @@
     }
 
     @Override
+    public List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO) {
+
+        List<OffLineExportDTO> exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO);
+        exportDTOList.forEach(dto -> {
+            dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他");
+            dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):"");
+        });
+        return exportDTOList;
+    }
+
+    @Override
     public List<ResultDTO> dataReport() {
         List<ResultDTO> resultDTOList = new ArrayList<>();
         List<ResultDTO> tables = this.baseMapper.dataTables();
@@ -137,4 +148,15 @@
         }
         return deptIdStr;
     }
+
+    public String getDeptNamesByDeptId(Long deptId) {
+        List<Long> deptIds = abstractDeptService.getParentListById(deptId);
+        deptIds.add(deptId);
+        QueryWrapper<Dept> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id", deptIds);
+        queryWrapper.orderByAsc("pids");
+        List<Dept> deptList = abstractDeptService.list(queryWrapper);
+        List<String> nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList());
+        return String.join("/", nameList);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
index 1c48c49..d5b0b08 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
@@ -3,11 +3,15 @@
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
+import com.casic.missiles.modular.device.entity.BaseDeviceType;
 import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.modular.device.dao.BusRepairLogMapper;
+import com.casic.missiles.modular.device.service.IBaseDeviceTypeService;
 import com.casic.missiles.modular.device.service.IBusRepairLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,9 +24,12 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class BusRepairLogServiceImpl extends ServiceImpl<BusRepairLogMapper, BusRepairLog> implements IBusRepairLogService {
 
+    private final AbstractDictService abstractDictService;
+    private final IBaseDeviceTypeService deviceTypeService;
 
     @Override
     public Page<BusRepairLog> listPage(Page<BusRepairLog> page, BusRepairLogRequestDTO requestDTO) {
@@ -35,7 +42,17 @@
         queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRepairPerson()), "REPAIR_PERSON", requestDTO.getRepairPerson());
         queryWrapper.ge(ObjectUtil.isNotEmpty(requestDTO.getBegTime()), "REPAIR_TIME", requestDTO.getBegTime());
         queryWrapper.le(ObjectUtil.isNotEmpty(requestDTO.getEndTime()), "REPAIR_TIME", requestDTO.getEndTime());
-        Page<BusRepairLog> ListPage = this.page(page, queryWrapper);
-        return ListPage;
+        Page<BusRepairLog> repairLogPage = this.page(page, queryWrapper);
+        List<BusRepairLog> repairLogList = repairLogPage.getRecords();
+        List<BaseDeviceType> typeList = deviceTypeService.list();
+        repairLogList.forEach(busRepairLog -> {
+            busRepairLog.setRepairType(abstractDictService.getDictNameByCode("repairType", busRepairLog.getRepairType()));
+            for (BaseDeviceType deviceType : typeList) {
+                if (deviceType.getId().equals(busRepairLog.getDeviceType())) {
+                    busRepairLog.setDeviceTypeName(deviceType.getTypeName());
+                }
+            }
+        });
+        return repairLogPage;
     }
 }

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
index 18cf18a..5596e33 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
@@ -33,6 +33,10 @@
                                          @Param("request") OffLineRequestDTO request,
                                          Page<OffLineResponseDTO> page);
 
+    List<OffLineExportDTO> batchExportOffLineList(@Param("deptStrs") String deptStrs,
+                                                  @Param("request") OffLineRequestDTO request);
+
+
     List<ResultDTO> dataReport(@Param("tables") List<ResultDTO> tables);
 
     @Select("SELECT table_name as `name`,time_field as `value` FROM `data_table_names` ")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
index 5531cf7..62cc565 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
@@ -181,6 +181,52 @@
 
     </select>
 
+
+    <select id="batchExportOffLineList" resultType="com.casic.missiles.modular.device.dto.OffLineExportDTO">
+
+        SELECT
+        bd.DEVCODE,
+        bv.tagNumber,
+        bv.place,
+        bv.deptid,
+        bm.`NAME` as manufactureName,
+        bd.LOGTIME as lastTime,
+        IF(bd.CELL <![CDATA[  <=  ]]> 10,1,4) as reasons,
+        bt.TYPE_NAME as devTypeName,
+        CASE
+        bd.LOGTIME
+        WHEN NULL THEN
+        NULL ELSE timestampdiff(
+        DAY,
+        LOGTIME,
+        NOW())
+        END AS offDays
+        FROM
+        `bus_device` bd
+        LEFT JOIN bus_device_ledger lr ON lr.DEVICE_ID = bd.ID
+        LEFT JOIN bus_ledger_all_view bv ON lr.LEDGER_ID = bv.ID
+        AND lr.type = bv.type
+        LEFT JOIN base_device_type bt on bt.id = bd.DEVICE_TYPE
+        LEFT JOIN base_product bp on bp.id = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm on bm.id = bp.MANUFACTURER_ID
+        WHERE
+        bd.VALID > 0
+        AND bd.ONLINE_STATE =0
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bv.DEPTID in (${deptStrs})
+        </if>
+        <if test="request.devcode != null and request.devcode !='' ">
+            and  bd.DEVCODE   like concat('%', #{request.devcode}, '%')
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and  bd.DEVICE_TYPE = #{request.devTypeId}
+        </if>
+        <if test="request.reasons == '1'">
+            bd.CELL <![CDATA[  <=  ]]> 10
+        </if>
+
+    </select>
+
     <select id="company" resultType="com.casic.missiles.modular.device.dto.DeviceCompanyDTO">
         WITH device_temp AS (
             SELECT
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 73c398a..baff88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -186,10 +186,12 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ar.ALARM_LEVEL,
+        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
-        FROM `alarm_records` ar  where ar.PROCESS_STATUS=7 and ar.`STATUS`=0
+        FROM `alarm_records` ar
+        LEFT JOIN alarm_level_control ac  ON ac.id = ar.ALARM_LEVEL
+        WHERE ar.PROCESS_STATUS=7 and ar.`STATUS`=0
            and  ar.LEDGER_CODE=  #{wellCode}
         <if test="request.begTime != null and request.begTime !='' ">
             and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index a1d06b2..f295c15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@
 import java.util.Date;
 
 @Data
+@ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
     @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("报警时间")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
new file mode 100644
index 0000000..2ea2c69
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+@ExcelIgnoreUnannotated
+public class OffLineExportDTO {
+
+    @ExcelProperty(value = "设备编号", order = 1)
+    private String devcode;
+
+    @ExcelProperty(value = "设备类型", order = 2)
+    private String devTypeName;
+
+    @ExcelProperty(value = "安装位号", order = 4)
+    private String tagNumber;
+
+    @ExcelProperty(value = "最新记录上传时间", order = 7)
+    private String lastTime;
+
+    @ExcelProperty(value = "离线天数", order = 8)
+    private String offDays;
+
+    @ExcelProperty(value = "管理单位", order = 6)
+    private String deptName;
+
+    @ExcelProperty(value = "设备厂家", order = 3)
+    private String manufactureName;
+
+    @ExcelProperty(value = "详细位置", order = 5)
+    private String position;
+
+    @ExcelProperty(value = "离线原因预测", order = 9)
+    private String reasons;
+
+    private Long deptid;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
index 6612456..bb3b106 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,6 +8,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,8 +23,8 @@
  * @author zt
  * @since 2024-07-16
  */
-@Getter
-@Setter
+@Data
+@ExcelIgnoreUnannotated
 @TableName("bus_repair_log")
 @ApiModel(value = "BusRepairLog对象", description = "运维管理	")
 public class BusRepairLog implements Serializable {
@@ -38,7 +40,6 @@
     @TableField("DEVCODE")
     private String devcode;
 
-    @ExcelProperty(value = "设备类型", order = 2)
     @ApiModelProperty("设备类型id")
     @TableField("DEVICE_TYPE")
     private Long deviceType;
@@ -81,5 +82,9 @@
     @TableField("TS")
     private Date ts;
 
+    @ExcelProperty(value = "设备类型", order = 2)
+    @ApiModelProperty("设备类型名称")
+    @TableField(exist = false)
+    private String deviceTypeName;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
index 3d371a9..99d9b17 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
@@ -22,6 +22,8 @@
 
     List<DeviceOffDTO> offLine();
 
+    List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO);
+
     List<ResultDTO> company();
 
     Page<OffLineResponseDTO> offLineList(OffLineRequestDTO requestDTO, Page<OffLineResponseDTO> page);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
index e94d674..17d9b3a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
@@ -97,7 +97,7 @@
                 deptChildIds.add(dept.getId());
                 for (DeviceCompanyDTO dto : deviceCompanyDTOList) {
                     if (deptChildIds.contains(dto.getDeptid())) {
-                        resultDTO.setValue((Long.valueOf(resultDTO.getValue())+dto.getDeviceCount())+"");
+                        resultDTO.setValue((Long.valueOf(resultDTO.getValue()) + dto.getDeviceCount()) + "");
                     }
                 }
                 resultDTOList.add(resultDTO);
@@ -118,6 +118,17 @@
     }
 
     @Override
+    public List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO) {
+
+        List<OffLineExportDTO> exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO);
+        exportDTOList.forEach(dto -> {
+            dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他");
+            dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):"");
+        });
+        return exportDTOList;
+    }
+
+    @Override
     public List<ResultDTO> dataReport() {
         List<ResultDTO> resultDTOList = new ArrayList<>();
         List<ResultDTO> tables = this.baseMapper.dataTables();
@@ -137,4 +148,15 @@
         }
         return deptIdStr;
     }
+
+    public String getDeptNamesByDeptId(Long deptId) {
+        List<Long> deptIds = abstractDeptService.getParentListById(deptId);
+        deptIds.add(deptId);
+        QueryWrapper<Dept> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id", deptIds);
+        queryWrapper.orderByAsc("pids");
+        List<Dept> deptList = abstractDeptService.list(queryWrapper);
+        List<String> nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList());
+        return String.join("/", nameList);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
index 1c48c49..d5b0b08 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
@@ -3,11 +3,15 @@
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
+import com.casic.missiles.modular.device.entity.BaseDeviceType;
 import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.modular.device.dao.BusRepairLogMapper;
+import com.casic.missiles.modular.device.service.IBaseDeviceTypeService;
 import com.casic.missiles.modular.device.service.IBusRepairLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,9 +24,12 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class BusRepairLogServiceImpl extends ServiceImpl<BusRepairLogMapper, BusRepairLog> implements IBusRepairLogService {
 
+    private final AbstractDictService abstractDictService;
+    private final IBaseDeviceTypeService deviceTypeService;
 
     @Override
     public Page<BusRepairLog> listPage(Page<BusRepairLog> page, BusRepairLogRequestDTO requestDTO) {
@@ -35,7 +42,17 @@
         queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRepairPerson()), "REPAIR_PERSON", requestDTO.getRepairPerson());
         queryWrapper.ge(ObjectUtil.isNotEmpty(requestDTO.getBegTime()), "REPAIR_TIME", requestDTO.getBegTime());
         queryWrapper.le(ObjectUtil.isNotEmpty(requestDTO.getEndTime()), "REPAIR_TIME", requestDTO.getEndTime());
-        Page<BusRepairLog> ListPage = this.page(page, queryWrapper);
-        return ListPage;
+        Page<BusRepairLog> repairLogPage = this.page(page, queryWrapper);
+        List<BusRepairLog> repairLogList = repairLogPage.getRecords();
+        List<BaseDeviceType> typeList = deviceTypeService.list();
+        repairLogList.forEach(busRepairLog -> {
+            busRepairLog.setRepairType(abstractDictService.getDictNameByCode("repairType", busRepairLog.getRepairType()));
+            for (BaseDeviceType deviceType : typeList) {
+                if (deviceType.getId().equals(busRepairLog.getDeviceType())) {
+                    busRepairLog.setDeviceTypeName(deviceType.getTypeName());
+                }
+            }
+        });
+        return repairLogPage;
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index ea96b37..587ea1e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -101,7 +101,7 @@
         List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode,request);
         for(LifeCycleRecordDTO cycleRecordDTO:lifeCycleRecordDTOList){
             cycleRecordDTO.setProcessDuration(TimeConverter(cycleRecordDTO.getProcessDuration()));
-            cycleRecordDTO.setRealAlarm("1".equals(cycleRecordDTO.getRealAlarm())?"是":"否");
+            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm())?"是":"否");
             alarmTypeMaps.forEach(map->{
                 if(map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId()+"")){
                     cycleRecordDTO.setAlarmTypeName(map.get("ALARM_TYPE").toString());

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 a939800..a8e6bb5 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
@@ -117,7 +117,7 @@
         Assert.isFalse(Objects.isNull(idsDTO.getIds()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iAlarmRecordsService.removeByIds(idsDTO.getIds()));
+        return ReturnUtil.success(iAlarmRecordsService.removeAlarmsByIds(idsDTO.getIds()));
     }
 
     @ApiOperation("挂起")
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
index 800549c..7c4f4a3 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/ApprovalLogMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.modular.alarm.entity.ApprovalLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,8 @@
     @Select("SELECT al.DESCN FROM `approval_log` al where al.ALARM_ID= #{alarmId} and al.FLOW_STATUS = #{processStatus} order by APPROVAL_TIME DESC LIMIT 1")
     String getMsg(@Param("alarmId") Long alarmId,@Param("processStatus") String processStatus);
 
-
+    @Delete("delete from approval_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
 
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
index bd8cd46..ba85978 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java
@@ -3,6 +3,7 @@
 import com.casic.missiles.modular.alarm.dto.AppRequestDTO;
 import com.casic.missiles.modular.alarm.entity.RemindLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -40,4 +41,8 @@
             " LIMIT 1")
     AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId);
 
+
+    @Delete("delete from remind_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
index 6d98c9d..7496400 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/SuspendLogMapper.java
@@ -2,7 +2,9 @@
 
 import com.casic.missiles.modular.alarm.entity.SuspendLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,7 @@
 @Mapper
 public interface SuspendLogMapper extends BaseMapper<SuspendLog> {
 
+    @Delete("delete from suspend_log where ALARM_ID in (${alarmIds})")
+    void  deleteByAlarmIds(@Param("alarmIds") String alarmIds);
+
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
index c8e7d0e..a91ade8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/mapping/AlarmRuleDeviceMapper.xml
@@ -22,9 +22,11 @@
             rd.*,
             bt.TYPE_NAME AS devTypeName,
             lr.place as POSITION,
-            lr.tagNumber
+            lr.tagNumber,
+            ay.ALARM_TYPE
         FROM
         alarm_rule_device rd
+            LEFT JOIN alarm_type ay  ON rd.ALARM_TYPE_ID=ay.ID
             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
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
index e577203..0225611 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/AlarmRuleDevice.java
@@ -73,6 +73,10 @@
     @TableField(exist = false)
     private String alarmRuleName;
 
+    @ApiModelProperty("报警类型名称")
+    @TableField(exist = false)
+    private String alarmType;
+
     @ApiModelProperty("创建人")
     @TableField("CREATE_USER")
     private String createUser;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
index b4d00b1..080f71f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/entity/MessageLog.java
@@ -53,6 +53,11 @@
     @TableField("TAG_NUMBER")
     private String tagNumber;
 
+    @ApiModelProperty("报警id")
+    @TableField("ALARM_ID")
+    private Long alarmId;
+
+
 
     @ApiModelProperty("创建时间")
     @TableField("TS")
@@ -61,11 +66,12 @@
     public MessageLog() {
     }
 
-    public MessageLog(String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
+    public MessageLog(Long alarmId,String messageType, String messageTypeDetail, String messageContent,String tagNumber) {
         this.messageType = messageType;
         this.messageTypeDetail = messageTypeDetail;
         this.messageContent = messageContent;
         this.tagNumber = tagNumber;
+        this.alarmId = alarmId;
 
     }
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index b5df9e6..0e1fd14 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -40,6 +40,8 @@
 
     boolean suspend(SuspendDTO suspendDTO);
 
+    boolean removeAlarmsByIds(List<Long> alarmIds);
+
     boolean remind(RemindDTO remindDTO);
 
     boolean handle(HandleDTO handleDTO);
@@ -72,7 +74,7 @@
 
     void updateCell(String devCode, String onLineStatus, String cell);
 
-    boolean isDataAlarmByCode(String devCode, Float alarmThreshold);
+    boolean isDataAlarmByCode(String devCode, Long alarmLevel,Float alarmThreshold);
 
     boolean isDeviceAlarmByCode(String devCode, String alarmThreshold);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
index 953ae97..b72b8cc 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IMessageLogService.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.alarm.entity.MessageLog;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息通知管理	 服务类
@@ -16,4 +18,6 @@
 
     Page<MessageLog> notePage(Page<MessageLog> page );
 
+    void removeByAlarmIds(List<Long> alarmIds);
+
 }
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 71c6606..fb3f925 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
@@ -105,7 +105,7 @@
     @Override
     public List<DeviceAlarmResponseDTO> batchExportDeviceAlarmList(AlarmRecordDTO request) {
 
-        List<DeviceAlarmResponseDTO> alarmResponseDTOList =this.baseMapper.batchExportDeviceAlarmList(request,getDeptIds(request.getDeptId()));
+        List<DeviceAlarmResponseDTO> alarmResponseDTOList = this.baseMapper.batchExportDeviceAlarmList(request, getDeptIds(request.getDeptId()));
         alarmResponseDTOList.forEach(dto -> {
             dto.setProcessStatus(ApprovalStatusEnum.getValue(dto.getProcessStatus()));
         });
@@ -289,6 +289,25 @@
 
     @Transactional
     @Override
+    public boolean removeAlarmsByIds(List<Long> alarmIds) {
+
+        String alarmIdsStr = alarmIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(","));
+        //删消息通知信息
+        iMessageLogService.removeByAlarmIds(alarmIds);
+        //消除流程信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除提醒信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //消除挂起信息
+        approvalLogMapper.deleteByAlarmIds(alarmIdsStr);
+        //删除报警记录
+        return this.removeByIds(alarmIds);
+    }
+
+    @Transactional
+    @Override
     public boolean remind(RemindDTO remindDTO) {
         //判断是否提醒
         RemindLog remindLog = remindLogMapper.getRemindLogByAlarmId(remindDTO.getAlarmId());
@@ -414,7 +433,7 @@
             alarmRecords.setProcessStatus(ApprovalStatusEnum.PROCESSED.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场处置完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场处置完毕"), alarmRecords.getLedgerNumber()));
         } else if (DictEnum.CONFIRM_TYPE.equals(msgType)) {
@@ -423,7 +442,7 @@
                     ApprovalStatusEnum.UNPROCESS.getCode());
             alarmRecords.setProcessTime(new Date());
             this.baseMapper.updateById(alarmRecords);
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
+            iMessageLogService.save(new MessageLog(alarmRecords.getId(), DictEnum.MESSAGE_TYPE_2, "现场确认完毕",
                     alarmRecords.getLedgerNumber().concat(alarmRecords.getAlarmContent()).
                             concat("现场确认完毕"), alarmRecords.getLedgerNumber()));
         }
@@ -540,11 +559,11 @@
      * 根据设备编号查询是否有数据异常记录
      *
      * @param devCode
-     * @param alarmThreshold
+     * @param alarmLevel
      * @return
      */
     @Override
-    public boolean isDataAlarmByCode(String devCode, Float alarmThreshold) {
+    public boolean isDataAlarmByCode(String devCode, Long alarmLevel, Float alarmValue) {
         QueryWrapper<AlarmRecords> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("DEVCODE", devCode);
         queryWrapper.eq("EXCEPTION_TYPE", "0");
@@ -552,9 +571,22 @@
         List<AlarmRecords> alarmRecordsList = this.list(queryWrapper);
         if (alarmRecordsList != null && alarmRecordsList.size() > 0) {
             for (AlarmRecords alarmRecords : alarmRecordsList) {
-                //toDo:若新来报警升级，则挂起状态的 改为 未读
+                //若新来报警升级，则挂起状态的 改为未读
                 if (CommonUtil.isNumber(alarmRecords.getAlarmValue())) {
-
+                    if ((!alarmLevel.equals(alarmRecords.getAlarmLevel())) &&
+                            alarmValue > Float.valueOf(alarmRecords.getAlarmValue()) &&
+                            ApprovalStatusEnum.SUSPEND.getCode().equals(alarmRecords.getProcessStatus())) {
+                        alarmRecords.setProcessStatus(ApprovalStatusEnum.UNREAD.getCode());
+                        alarmRecords.setPreProcessStatus(alarmRecords.getProcessStatus());
+                        alarmRecords.setAlarmValue(alarmValue + "");
+                        alarmRecords.setAlarmLevel(alarmLevel);
+                        this.baseMapper.updateById(alarmRecords);
+                        approvalLogMapper.insert(new ApprovalLog(alarmRecords.getId(), "1",
+                                "",
+                                alarmRecords.getProcessStatus(),
+                                null,
+                                "报警升级"));
+                    }
                 }
             }
             return true;
@@ -591,7 +623,7 @@
             }
         }
         //保存消息通知
-        iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
+        iMessageLogService.save(new MessageLog(alarmId, DictEnum.MESSAGE_TYPE_1, alarmRuleResponseDTO.getAlarmTypeName(),
                 ObjectUtil.isNotEmpty(busWellDTOList) ? busWellDTOList.get(0).getTagNumber().
                         concat(busWellDTOList.get(0).getLedgerName()).
                         concat(alarmRuleResponseDTO.getAlarmTypeName()).
@@ -669,7 +701,7 @@
                     "", "8",
                     null));
             //添加消息通知
-            iMessageLogService.save(new MessageLog(DictEnum.MESSAGE_TYPE_3, "报警解除",
+            iMessageLogService.save(new MessageLog(alarmRecordsList.get(0).getId(), DictEnum.MESSAGE_TYPE_3, "报警解除",
                     alarmRecordsList.get(0).getLedgerNumber().concat(alarmRecordsList.get(0).getAlarmContent()).
                             concat("报警解除"), alarmRecordsList.get(0).getLedgerNumber()));
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
index 8aa5eeb..f59542d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleDeviceServiceImpl.java
@@ -35,8 +35,8 @@
         List<AlarmRuleDevice> alarmRuleDeviceList = alarmRuleDevicePage.getRecords();
         alarmRuleDeviceList.forEach(alarmRuleDevice -> {
             AlarmLevelControl alarmLevelControl = iAlarmLevelControlService.getById(alarmRuleDevice.getAlarmLevelId());
-            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmRule().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
-                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()));
+            alarmRuleDevice.setAlarmRuleName(alarmRuleDevice.getAlarmType().concat("[").concat(alarmLevelControl != null ? alarmLevelControl.getAlarmLevel() :
+                    "").concat("]:").concat(alarmRuleDevice.getAlarmThreshold()).concat("%LEL"));
         });
         return alarmRuleDevicePage;
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
index bc1883d..8686f04 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/MessageLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -11,6 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -42,4 +44,11 @@
         }
         return deptIdStr;
     }
+
+    @Override
+    public void removeByAlarmIds(List<Long> alarmIds) {
+        QueryWrapper<MessageLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("ALARM_ID",alarmIds);
+        this.remove(queryWrapper);
+    }
 }
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index 6bb4b08..6bbad1c 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -161,7 +161,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.Methane.getName());
                             }
                             break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index 7f17171..bb05167 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -196,7 +196,7 @@
                                     gas >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                                 //写入报警
                                 //1、判断报警是否已存在
-                                if (!alarmRecordsService.isDataAlarmByCode(devCode, gas)) {
+                                if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(),gas)) {
                                     alarmFlag = alarmRecordsService.saveAlarms(devCode, gas+"", uptime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.MonitorPipeOther.getName());
                                 }
                                 break;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
index ef653df..e6cf801 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataTubeOtherServiceImpl.java
@@ -167,7 +167,7 @@
                                 Float.valueOf(gas) >= Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold())) {
                             //写入报警
                             //1、判断报警是否已存在
-                            if (!alarmRecordsService.isDataAlarmByCode(devCode, Float.valueOf(alarmRuleResponseDTO.getAlarmThreshold()))) {
+                            if (!alarmRecordsService.isDataAlarmByCode(devCode, alarmRuleResponseDTO.getAlarmLevelId(), Float.valueOf(gas))) {
                                 alarmFlag = alarmRecordsService.saveAlarms(devCode, gas, upTime, busWellDTOList, alarmRuleResponseDTO, DeviceTypeEnum.TubeOther.getName());
                             }
                             break;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
index 18da3cd..02e2520 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusDeviceStaticsController.java
@@ -3,10 +3,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.modular.device.dto.*;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.service.IBusDeviceStaticsService;
 import com.casic.missiles.util.ReturnUtil;
 import io.swagger.annotations.Api;
@@ -14,6 +15,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * <p>
  * 产品管理 前端控制器
@@ -28,7 +32,7 @@
 @RequestMapping("/device/statics")
 public class BusDeviceStaticsController extends ExportController {
     private final IBusDeviceStaticsService iBusDeviceStaticsService;
-
+    private final IBaseExportService iBaseExportService;
 
 
     @ApiOperation("设备运行情况")
@@ -50,7 +54,7 @@
     @PostMapping("/offLine")
     @ResponseBody
     public ReturnDTO<DeviceOffDTO> offLine() {
-        
+
         return ReturnUtil.success(iBusDeviceStaticsService.offLine());
     }
 
@@ -58,7 +62,7 @@
     @PostMapping("/company")
     @ResponseBody
     public ReturnDTO<ResultDTO> company() {
-       
+
         return ReturnUtil.success(iBusDeviceStaticsService.company());
     }
 
@@ -67,7 +71,18 @@
     @ResponseBody
     public ReturnDTO<OffLineResponseDTO> offLineList(@RequestBody OffLineRequestDTO requestDTO) {
         Page<OffLineResponseDTO> page = PageFactory.defaultPage();
-        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO,page)));
+        return ReturnUtil.success(super.packForBT(iBusDeviceStaticsService.offLineList(requestDTO, page)));
+    }
+
+    @ApiOperation("离线设备清单导出")
+    @RequestMapping(value = "/batchExport", method = RequestMethod.GET)
+    public void batchExport(OffLineRequestDTO request, HttpServletResponse response) {
+        try {
+            iBaseExportService.exportExcel(response, OffLineExportDTO.class, iBusDeviceStaticsService.batchExportOffLineList(request), ExportEnum.DEVICE_OFF_EXPORT.getSheetName());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
index 18cf18a..5596e33 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusDeviceStaticsMapper.java
@@ -33,6 +33,10 @@
                                          @Param("request") OffLineRequestDTO request,
                                          Page<OffLineResponseDTO> page);
 
+    List<OffLineExportDTO> batchExportOffLineList(@Param("deptStrs") String deptStrs,
+                                                  @Param("request") OffLineRequestDTO request);
+
+
     List<ResultDTO> dataReport(@Param("tables") List<ResultDTO> tables);
 
     @Select("SELECT table_name as `name`,time_field as `value` FROM `data_table_names` ")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
index 5531cf7..62cc565 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusDeviceStaticsMapper.xml
@@ -181,6 +181,52 @@
 
     </select>
 
+
+    <select id="batchExportOffLineList" resultType="com.casic.missiles.modular.device.dto.OffLineExportDTO">
+
+        SELECT
+        bd.DEVCODE,
+        bv.tagNumber,
+        bv.place,
+        bv.deptid,
+        bm.`NAME` as manufactureName,
+        bd.LOGTIME as lastTime,
+        IF(bd.CELL <![CDATA[  <=  ]]> 10,1,4) as reasons,
+        bt.TYPE_NAME as devTypeName,
+        CASE
+        bd.LOGTIME
+        WHEN NULL THEN
+        NULL ELSE timestampdiff(
+        DAY,
+        LOGTIME,
+        NOW())
+        END AS offDays
+        FROM
+        `bus_device` bd
+        LEFT JOIN bus_device_ledger lr ON lr.DEVICE_ID = bd.ID
+        LEFT JOIN bus_ledger_all_view bv ON lr.LEDGER_ID = bv.ID
+        AND lr.type = bv.type
+        LEFT JOIN base_device_type bt on bt.id = bd.DEVICE_TYPE
+        LEFT JOIN base_product bp on bp.id = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm on bm.id = bp.MANUFACTURER_ID
+        WHERE
+        bd.VALID > 0
+        AND bd.ONLINE_STATE =0
+        <if test="deptStrs != null and deptStrs !='' ">
+            and bv.DEPTID in (${deptStrs})
+        </if>
+        <if test="request.devcode != null and request.devcode !='' ">
+            and  bd.DEVCODE   like concat('%', #{request.devcode}, '%')
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and  bd.DEVICE_TYPE = #{request.devTypeId}
+        </if>
+        <if test="request.reasons == '1'">
+            bd.CELL <![CDATA[  <=  ]]> 10
+        </if>
+
+    </select>
+
     <select id="company" resultType="com.casic.missiles.modular.device.dto.DeviceCompanyDTO">
         WITH device_temp AS (
             SELECT
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index 73c398a..baff88f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -186,10 +186,12 @@
     </select>
 
     <select id="lifecycleRecord" resultType="com.casic.missiles.modular.device.dto.LifeCycleRecordDTO">
-        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ar.ALARM_LEVEL,
+        SELECT ar.ALARM_TIME,ar.ALARM_TYPE_ID,ac.ALARM_LEVEL,
                ar.ALARM_CONTENT,ar.REAL_ALARM,ar.CANCEL_TIME,
                TIMESTAMPDIFF(MINUTE, ar.ALARM_TIME, ar.PROCESS_TIME) as processDuration
-        FROM `alarm_records` ar  where ar.PROCESS_STATUS=7 and ar.`STATUS`=0
+        FROM `alarm_records` ar
+        LEFT JOIN alarm_level_control ac  ON ac.id = ar.ALARM_LEVEL
+        WHERE ar.PROCESS_STATUS=7 and ar.`STATUS`=0
            and  ar.LEDGER_CODE=  #{wellCode}
         <if test="request.begTime != null and request.begTime !='' ">
             and  ar.ALARM_TIME <![CDATA[  >=  ]]> #{request.begTime}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
index a1d06b2..f295c15 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/LifeCycleRecordDTO.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -7,6 +8,7 @@
 import java.util.Date;
 
 @Data
+@ExcelIgnoreUnannotated
 public class LifeCycleRecordDTO {
     @ExcelProperty(value = "设备编号", order = 1)
     @ApiModelProperty("报警时间")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
new file mode 100644
index 0000000..2ea2c69
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/OffLineExportDTO.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.device.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+@ExcelIgnoreUnannotated
+public class OffLineExportDTO {
+
+    @ExcelProperty(value = "设备编号", order = 1)
+    private String devcode;
+
+    @ExcelProperty(value = "设备类型", order = 2)
+    private String devTypeName;
+
+    @ExcelProperty(value = "安装位号", order = 4)
+    private String tagNumber;
+
+    @ExcelProperty(value = "最新记录上传时间", order = 7)
+    private String lastTime;
+
+    @ExcelProperty(value = "离线天数", order = 8)
+    private String offDays;
+
+    @ExcelProperty(value = "管理单位", order = 6)
+    private String deptName;
+
+    @ExcelProperty(value = "设备厂家", order = 3)
+    private String manufactureName;
+
+    @ExcelProperty(value = "详细位置", order = 5)
+    private String position;
+
+    @ExcelProperty(value = "离线原因预测", order = 9)
+    private String reasons;
+
+    private Long deptid;
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
index 6612456..bb3b106 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusRepairLog.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.device.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,6 +8,7 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,8 +23,8 @@
  * @author zt
  * @since 2024-07-16
  */
-@Getter
-@Setter
+@Data
+@ExcelIgnoreUnannotated
 @TableName("bus_repair_log")
 @ApiModel(value = "BusRepairLog对象", description = "运维管理	")
 public class BusRepairLog implements Serializable {
@@ -38,7 +40,6 @@
     @TableField("DEVCODE")
     private String devcode;
 
-    @ExcelProperty(value = "设备类型", order = 2)
     @ApiModelProperty("设备类型id")
     @TableField("DEVICE_TYPE")
     private Long deviceType;
@@ -81,5 +82,9 @@
     @TableField("TS")
     private Date ts;
 
+    @ExcelProperty(value = "设备类型", order = 2)
+    @ApiModelProperty("设备类型名称")
+    @TableField(exist = false)
+    private String deviceTypeName;
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
index 3d371a9..99d9b17 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceStaticsService.java
@@ -22,6 +22,8 @@
 
     List<DeviceOffDTO> offLine();
 
+    List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO);
+
     List<ResultDTO> company();
 
     Page<OffLineResponseDTO> offLineList(OffLineRequestDTO requestDTO, Page<OffLineResponseDTO> page);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
index e94d674..17d9b3a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceStaticsServiceImpl.java
@@ -97,7 +97,7 @@
                 deptChildIds.add(dept.getId());
                 for (DeviceCompanyDTO dto : deviceCompanyDTOList) {
                     if (deptChildIds.contains(dto.getDeptid())) {
-                        resultDTO.setValue((Long.valueOf(resultDTO.getValue())+dto.getDeviceCount())+"");
+                        resultDTO.setValue((Long.valueOf(resultDTO.getValue()) + dto.getDeviceCount()) + "");
                     }
                 }
                 resultDTOList.add(resultDTO);
@@ -118,6 +118,17 @@
     }
 
     @Override
+    public List<OffLineExportDTO> batchExportOffLineList(OffLineRequestDTO requestDTO) {
+
+        List<OffLineExportDTO> exportDTOList = this.baseMapper.batchExportOffLineList(getDeptIds(), requestDTO);
+        exportDTOList.forEach(dto -> {
+            dto.setReasons("1".equals(dto.getReasons()) ? "电量低" : "其他");
+            dto.setDeptName(null!=dto.getDeptid()?getDeptNamesByDeptId(dto.getDeptid()):"");
+        });
+        return exportDTOList;
+    }
+
+    @Override
     public List<ResultDTO> dataReport() {
         List<ResultDTO> resultDTOList = new ArrayList<>();
         List<ResultDTO> tables = this.baseMapper.dataTables();
@@ -137,4 +148,15 @@
         }
         return deptIdStr;
     }
+
+    public String getDeptNamesByDeptId(Long deptId) {
+        List<Long> deptIds = abstractDeptService.getParentListById(deptId);
+        deptIds.add(deptId);
+        QueryWrapper<Dept> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id", deptIds);
+        queryWrapper.orderByAsc("pids");
+        List<Dept> deptList = abstractDeptService.list(queryWrapper);
+        List<String> nameList = deptList.stream().filter(dept -> ObjectUtil.isNotEmpty(dept.getTips())).map(Dept::getFullName).collect(Collectors.toList());
+        return String.join("/", nameList);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
index 1c48c49..d5b0b08 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusRepairLogServiceImpl.java
@@ -3,11 +3,15 @@
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.modular.device.dto.BusRepairLogRequestDTO;
+import com.casic.missiles.modular.device.entity.BaseDeviceType;
 import com.casic.missiles.modular.device.entity.BusRepairLog;
 import com.casic.missiles.modular.device.dao.BusRepairLogMapper;
+import com.casic.missiles.modular.device.service.IBaseDeviceTypeService;
 import com.casic.missiles.modular.device.service.IBusRepairLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,9 +24,12 @@
  * @author zt
  * @since 2024-07-16
  */
+@RequiredArgsConstructor
 @Service
 public class BusRepairLogServiceImpl extends ServiceImpl<BusRepairLogMapper, BusRepairLog> implements IBusRepairLogService {
 
+    private final AbstractDictService abstractDictService;
+    private final IBaseDeviceTypeService deviceTypeService;
 
     @Override
     public Page<BusRepairLog> listPage(Page<BusRepairLog> page, BusRepairLogRequestDTO requestDTO) {
@@ -35,7 +42,17 @@
         queryWrapper.like(ObjectUtil.isNotEmpty(requestDTO.getRepairPerson()), "REPAIR_PERSON", requestDTO.getRepairPerson());
         queryWrapper.ge(ObjectUtil.isNotEmpty(requestDTO.getBegTime()), "REPAIR_TIME", requestDTO.getBegTime());
         queryWrapper.le(ObjectUtil.isNotEmpty(requestDTO.getEndTime()), "REPAIR_TIME", requestDTO.getEndTime());
-        Page<BusRepairLog> ListPage = this.page(page, queryWrapper);
-        return ListPage;
+        Page<BusRepairLog> repairLogPage = this.page(page, queryWrapper);
+        List<BusRepairLog> repairLogList = repairLogPage.getRecords();
+        List<BaseDeviceType> typeList = deviceTypeService.list();
+        repairLogList.forEach(busRepairLog -> {
+            busRepairLog.setRepairType(abstractDictService.getDictNameByCode("repairType", busRepairLog.getRepairType()));
+            for (BaseDeviceType deviceType : typeList) {
+                if (deviceType.getId().equals(busRepairLog.getDeviceType())) {
+                    busRepairLog.setDeviceTypeName(deviceType.getTypeName());
+                }
+            }
+        });
+        return repairLogPage;
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index ea96b37..587ea1e 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -101,7 +101,7 @@
         List<LifeCycleRecordDTO> lifeCycleRecordDTOList = this.baseMapper.lifecycleRecord(wellCode,request);
         for(LifeCycleRecordDTO cycleRecordDTO:lifeCycleRecordDTOList){
             cycleRecordDTO.setProcessDuration(TimeConverter(cycleRecordDTO.getProcessDuration()));
-            cycleRecordDTO.setRealAlarm("1".equals(cycleRecordDTO.getRealAlarm())?"是":"否");
+            cycleRecordDTO.setRealAlarm("0".equals(cycleRecordDTO.getRealAlarm())?"是":"否");
             alarmTypeMaps.forEach(map->{
                 if(map.get("ID").toString().equals(cycleRecordDTO.getAlarmTypeId()+"")){
                     cycleRecordDTO.setAlarmTypeName(map.get("ALARM_TYPE").toString());
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
index a546cca..fe5bb18 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -11,6 +11,7 @@
     ALARM_DEVICE_EXPORT("alarmHistoryRecordData", "alarmHistoryRecordData", "设备正在报警记录"),
     ALARM_DEVICE_HISTORY_EXPORT("alarmHistoryRecordData", "alarmHistoryRecordData", "设备历史报警记录"),
     DEVICE_EXPORT("deviceInfo", "deviceInfo", "设备信息"),
+    DEVICE_OFF_EXPORT("deviceOffInfo", "deviceOffInfo", "设备离线信息"),
     LIFE_CYCLE_RECORD_EXPORT("lifeCycleRecord", "lifeCycleRecord", "全生命周期记录"),
     REPAIR_LOG_EXPORT("repairLog", "repairLog", "厂商运维记录"),
     PIPE_LINE_EXPORT("pipeLine", "pipeLine", "管线基础信息"),