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 c242ffb..c1ae6a9 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
@@ -161,6 +161,20 @@
     }
 
     /**
+     * 取消报警，即关闭工单
+     */
+    @RequestMapping(value = "/cancelAlarmById")
+    @ResponseBody
+    public Object cancelAlarmById(@RequestParam(value = "alarmId",required = true) long alarmId){
+        boolean isCancel = alarmRecordsService.cancelAlarmById(alarmId);
+        if(isCancel){
+            return ResponseData.success();
+        }else {
+            return ResponseData.error("failure");
+        }
+    }
+
+    /**
      * 批量消警
      */
     @RequestMapping(value = "/batchCancel")
@@ -178,7 +192,7 @@
         //根据查询条件查询alarm_record记录
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
-        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime);
+        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime,"");
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
             alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),jobStatus,handleMessage,currentUser.getId());
@@ -186,4 +200,31 @@
         return ResponseData.success();
     }
 
+    /**
+     * 批量消警
+     */
+    @RequestMapping(value = "/batchCancelAlarm")
+    @ResponseBody
+    @Transactional(rollbackFor = Exception.class)
+    public Object batchCancelAlarm(@RequestParam(value = "keywords",required = false) String keywords,
+                              @RequestParam(value = "alarmType",required = false) String alarmType,
+                              @RequestParam(value = "alarmContent",required = false) String alarmContent,
+                              @RequestParam(value = "beginTime",required = false) String beginTime,
+                              @RequestParam(value = "endTime",required = false) String endTime,
+                              @RequestParam(value = "areaId",required = false) String areaId){
+        Map<String,Object> retMap = new HashMap<>();
+
+        if (areaId.indexOf("00") > 0)
+            areaId = areaId.substring(0, areaId.indexOf("00"));
+
+        //根据查询条件查询alarm_record记录
+        DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
+        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
+
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarmById(alarmRecord.getId());
+        }
+        return ResponseData.success();
+    }
+
 }

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 c242ffb..c1ae6a9 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
@@ -161,6 +161,20 @@
     }
 
     /**
+     * 取消报警，即关闭工单
+     */
+    @RequestMapping(value = "/cancelAlarmById")
+    @ResponseBody
+    public Object cancelAlarmById(@RequestParam(value = "alarmId",required = true) long alarmId){
+        boolean isCancel = alarmRecordsService.cancelAlarmById(alarmId);
+        if(isCancel){
+            return ResponseData.success();
+        }else {
+            return ResponseData.error("failure");
+        }
+    }
+
+    /**
      * 批量消警
      */
     @RequestMapping(value = "/batchCancel")
@@ -178,7 +192,7 @@
         //根据查询条件查询alarm_record记录
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
-        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime);
+        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime,"");
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
             alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),jobStatus,handleMessage,currentUser.getId());
@@ -186,4 +200,31 @@
         return ResponseData.success();
     }
 
+    /**
+     * 批量消警
+     */
+    @RequestMapping(value = "/batchCancelAlarm")
+    @ResponseBody
+    @Transactional(rollbackFor = Exception.class)
+    public Object batchCancelAlarm(@RequestParam(value = "keywords",required = false) String keywords,
+                              @RequestParam(value = "alarmType",required = false) String alarmType,
+                              @RequestParam(value = "alarmContent",required = false) String alarmContent,
+                              @RequestParam(value = "beginTime",required = false) String beginTime,
+                              @RequestParam(value = "endTime",required = false) String endTime,
+                              @RequestParam(value = "areaId",required = false) String areaId){
+        Map<String,Object> retMap = new HashMap<>();
+
+        if (areaId.indexOf("00") > 0)
+            areaId = areaId.substring(0, areaId.indexOf("00"));
+
+        //根据查询条件查询alarm_record记录
+        DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
+        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
+
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarmById(alarmRecord.getId());
+        }
+        return ResponseData.success();
+    }
+
 }
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 9d25208..46e7dfe 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
@@ -20,9 +20,10 @@
 
     List<Map<String,Object>> alarmList(Page<Map<String,Object>> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope);
 
-    List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime);
+    List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
-    boolean cancelAlarm(int id,String jobStatus, String handleMessage, long personId);
+    boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+    boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
 }

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 c242ffb..c1ae6a9 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
@@ -161,6 +161,20 @@
     }
 
     /**
+     * 取消报警，即关闭工单
+     */
+    @RequestMapping(value = "/cancelAlarmById")
+    @ResponseBody
+    public Object cancelAlarmById(@RequestParam(value = "alarmId",required = true) long alarmId){
+        boolean isCancel = alarmRecordsService.cancelAlarmById(alarmId);
+        if(isCancel){
+            return ResponseData.success();
+        }else {
+            return ResponseData.error("failure");
+        }
+    }
+
+    /**
      * 批量消警
      */
     @RequestMapping(value = "/batchCancel")
@@ -178,7 +192,7 @@
         //根据查询条件查询alarm_record记录
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
-        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime);
+        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime,"");
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
             alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),jobStatus,handleMessage,currentUser.getId());
@@ -186,4 +200,31 @@
         return ResponseData.success();
     }
 
+    /**
+     * 批量消警
+     */
+    @RequestMapping(value = "/batchCancelAlarm")
+    @ResponseBody
+    @Transactional(rollbackFor = Exception.class)
+    public Object batchCancelAlarm(@RequestParam(value = "keywords",required = false) String keywords,
+                              @RequestParam(value = "alarmType",required = false) String alarmType,
+                              @RequestParam(value = "alarmContent",required = false) String alarmContent,
+                              @RequestParam(value = "beginTime",required = false) String beginTime,
+                              @RequestParam(value = "endTime",required = false) String endTime,
+                              @RequestParam(value = "areaId",required = false) String areaId){
+        Map<String,Object> retMap = new HashMap<>();
+
+        if (areaId.indexOf("00") > 0)
+            areaId = areaId.substring(0, areaId.indexOf("00"));
+
+        //根据查询条件查询alarm_record记录
+        DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
+        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
+
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarmById(alarmRecord.getId());
+        }
+        return ResponseData.success();
+    }
+
 }
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 9d25208..46e7dfe 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
@@ -20,9 +20,10 @@
 
     List<Map<String,Object>> alarmList(Page<Map<String,Object>> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope);
 
-    List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime);
+    List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
-    boolean cancelAlarm(int id,String jobStatus, String handleMessage, long personId);
+    boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+    boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
 }
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 0b66956..e0f0959 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
@@ -39,20 +39,25 @@
      * 查询告警列表，不分页，批量消警用
      */
     @Override
-    public List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime) {
+    public List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime, String areaId) {
         String sContent = null;
         if (ToolUtil.isNotEmpty(alarmContent)){
             sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent));
         }
-        return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime);
+        return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime, areaId);
     }
 
     @Override
-    public boolean cancelAlarm(int id, String jobStatus, String handleMessage, long personId) {
+    public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) {
         return this.baseMapper.cancelAlarm(id,jobStatus,handleMessage,personId);
     }
 
     @Override
+    public boolean cancelAlarmById(long id) {
+        return this.baseMapper.cancelAlarmById(id);
+    }
+
+    @Override
     public Integer insertAlarmRecord(AlarmRecords alarmRec) {
 //        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
         return this.baseMapper.insert(alarmRec);

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 c242ffb..c1ae6a9 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
@@ -161,6 +161,20 @@
     }
 
     /**
+     * 取消报警，即关闭工单
+     */
+    @RequestMapping(value = "/cancelAlarmById")
+    @ResponseBody
+    public Object cancelAlarmById(@RequestParam(value = "alarmId",required = true) long alarmId){
+        boolean isCancel = alarmRecordsService.cancelAlarmById(alarmId);
+        if(isCancel){
+            return ResponseData.success();
+        }else {
+            return ResponseData.error("failure");
+        }
+    }
+
+    /**
      * 批量消警
      */
     @RequestMapping(value = "/batchCancel")
@@ -178,7 +192,7 @@
         //根据查询条件查询alarm_record记录
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
-        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime);
+        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime,"");
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
             alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),jobStatus,handleMessage,currentUser.getId());
@@ -186,4 +200,31 @@
         return ResponseData.success();
     }
 
+    /**
+     * 批量消警
+     */
+    @RequestMapping(value = "/batchCancelAlarm")
+    @ResponseBody
+    @Transactional(rollbackFor = Exception.class)
+    public Object batchCancelAlarm(@RequestParam(value = "keywords",required = false) String keywords,
+                              @RequestParam(value = "alarmType",required = false) String alarmType,
+                              @RequestParam(value = "alarmContent",required = false) String alarmContent,
+                              @RequestParam(value = "beginTime",required = false) String beginTime,
+                              @RequestParam(value = "endTime",required = false) String endTime,
+                              @RequestParam(value = "areaId",required = false) String areaId){
+        Map<String,Object> retMap = new HashMap<>();
+
+        if (areaId.indexOf("00") > 0)
+            areaId = areaId.substring(0, areaId.indexOf("00"));
+
+        //根据查询条件查询alarm_record记录
+        DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
+        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
+
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarmById(alarmRecord.getId());
+        }
+        return ResponseData.success();
+    }
+
 }
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 9d25208..46e7dfe 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
@@ -20,9 +20,10 @@
 
     List<Map<String,Object>> alarmList(Page<Map<String,Object>> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope);
 
-    List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime);
+    List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
-    boolean cancelAlarm(int id,String jobStatus, String handleMessage, long personId);
+    boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+    boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
 }
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 0b66956..e0f0959 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
@@ -39,20 +39,25 @@
      * 查询告警列表，不分页，批量消警用
      */
     @Override
-    public List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime) {
+    public List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime, String areaId) {
         String sContent = null;
         if (ToolUtil.isNotEmpty(alarmContent)){
             sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent));
         }
-        return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime);
+        return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime, areaId);
     }
 
     @Override
-    public boolean cancelAlarm(int id, String jobStatus, String handleMessage, long personId) {
+    public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) {
         return this.baseMapper.cancelAlarm(id,jobStatus,handleMessage,personId);
     }
 
     @Override
+    public boolean cancelAlarmById(long id) {
+        return this.baseMapper.cancelAlarmById(id);
+    }
+
+    @Override
     public Integer insertAlarmRecord(AlarmRecords alarmRec) {
 //        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
         return this.baseMapper.insert(alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java
index 9ce18e7..87a71ff 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java
@@ -21,9 +21,11 @@
 
     List<Map<String,Object>> alarmList(@Param("page") Page<Map<String,Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("areaId") String areaId, @Param("dataScope") DataScope dataScope);
 
-    List<AlarmRecords> alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    List<AlarmRecords> alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("areaId") String areaId);
 
-    boolean cancelAlarm(@Param("id") int id,@Param("jobStatus")String jobStatus,@Param("handleMessage") String handleMessage,@Param("personId") long personId);
+    boolean cancelAlarm(@Param("id") long id, @Param("jobStatus")String jobStatus,@Param("handleMessage") String handleMessage,@Param("personId") long personId);
+
+    boolean cancelAlarmById(@Param("id") long id);
 
     boolean cancelAlarmByNewRecord(@Param("devcode") String devcode, @Param("alarmType") String alarmType);
 }

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 c242ffb..c1ae6a9 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
@@ -161,6 +161,20 @@
     }
 
     /**
+     * 取消报警，即关闭工单
+     */
+    @RequestMapping(value = "/cancelAlarmById")
+    @ResponseBody
+    public Object cancelAlarmById(@RequestParam(value = "alarmId",required = true) long alarmId){
+        boolean isCancel = alarmRecordsService.cancelAlarmById(alarmId);
+        if(isCancel){
+            return ResponseData.success();
+        }else {
+            return ResponseData.error("failure");
+        }
+    }
+
+    /**
      * 批量消警
      */
     @RequestMapping(value = "/batchCancel")
@@ -178,7 +192,7 @@
         //根据查询条件查询alarm_record记录
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
-        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime);
+        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope,keywords,alarmType,alarmContent,beginTime,endTime,"");
         //根据jobId调用closeJob
         for (AlarmRecords alarmRecord : alarmRecords) {
             alarmRecordsService.cancelAlarm(alarmRecord.getJobId(),jobStatus,handleMessage,currentUser.getId());
@@ -186,4 +200,31 @@
         return ResponseData.success();
     }
 
+    /**
+     * 批量消警
+     */
+    @RequestMapping(value = "/batchCancelAlarm")
+    @ResponseBody
+    @Transactional(rollbackFor = Exception.class)
+    public Object batchCancelAlarm(@RequestParam(value = "keywords",required = false) String keywords,
+                              @RequestParam(value = "alarmType",required = false) String alarmType,
+                              @RequestParam(value = "alarmContent",required = false) String alarmContent,
+                              @RequestParam(value = "beginTime",required = false) String beginTime,
+                              @RequestParam(value = "endTime",required = false) String endTime,
+                              @RequestParam(value = "areaId",required = false) String areaId){
+        Map<String,Object> retMap = new HashMap<>();
+
+        if (areaId.indexOf("00") > 0)
+            areaId = areaId.substring(0, areaId.indexOf("00"));
+
+        //根据查询条件查询alarm_record记录
+        DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
+        List<AlarmRecords> alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime, areaId);
+
+        for (AlarmRecords alarmRecord : alarmRecords) {
+            alarmRecordsService.cancelAlarmById(alarmRecord.getId());
+        }
+        return ResponseData.success();
+    }
+
 }
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 9d25208..46e7dfe 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
@@ -20,9 +20,10 @@
 
     List<Map<String,Object>> alarmList(Page<Map<String,Object>> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope);
 
-    List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime);
+    List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
-    boolean cancelAlarm(int id,String jobStatus, String handleMessage, long personId);
+    boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+    boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
 }
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 0b66956..e0f0959 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
@@ -39,20 +39,25 @@
      * 查询告警列表，不分页，批量消警用
      */
     @Override
-    public List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime) {
+    public List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent, String beginTime, String endTime, String areaId) {
         String sContent = null;
         if (ToolUtil.isNotEmpty(alarmContent)){
             sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent));
         }
-        return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime);
+        return this.baseMapper.alarmListNoPage(dataScope,keywords,alarmType,sContent,beginTime,endTime, areaId);
     }
 
     @Override
-    public boolean cancelAlarm(int id, String jobStatus, String handleMessage, long personId) {
+    public boolean cancelAlarm(long id, String jobStatus, String handleMessage, long personId) {
         return this.baseMapper.cancelAlarm(id,jobStatus,handleMessage,personId);
     }
 
     @Override
+    public boolean cancelAlarmById(long id) {
+        return this.baseMapper.cancelAlarmById(id);
+    }
+
+    @Override
     public Integer insertAlarmRecord(AlarmRecords alarmRec) {
 //        this.baseMapper.cancelAlarmByNewRecord(alarmRec.getDevcode(), alarmRec.getAlarmType());
         return this.baseMapper.insert(alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java
index 9ce18e7..87a71ff 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java
@@ -21,9 +21,11 @@
 
     List<Map<String,Object>> alarmList(@Param("page") Page<Map<String,Object>> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("areaId") String areaId, @Param("dataScope") DataScope dataScope);
 
-    List<AlarmRecords> alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+    List<AlarmRecords> alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("areaId") String areaId);
 
-    boolean cancelAlarm(@Param("id") int id,@Param("jobStatus")String jobStatus,@Param("handleMessage") String handleMessage,@Param("personId") long personId);
+    boolean cancelAlarm(@Param("id") long id, @Param("jobStatus")String jobStatus,@Param("handleMessage") String handleMessage,@Param("personId") long personId);
+
+    boolean cancelAlarmById(@Param("id") long id);
 
     boolean cancelAlarmByNewRecord(@Param("devcode") String devcode, @Param("alarmType") String alarmType);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 4d1c0a2..3b8e6de 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -103,6 +103,9 @@
         <if test="endTime!='' and endTime!=null">
             AND ar.ALARM_TIME <![CDATA[  <=  ]]> #{endTime}
         </if>
+        <if test="areaId!='' and areaId!= null">
+            AND bwi.area like concat(#{areaId}, '%')
+        </if>
     </select>
 
     <update id="cancelAlarm" flushCache="true">
@@ -119,6 +122,14 @@
         AND aj.ID = #{id}
     </update>
 
+    <update id="cancelAlarmById" flushCache="true">
+        UPDATE alarm_records ar
+        <set>
+            ar.status = 2
+        </set>
+        WHERE ar.ID = #{id}
+    </update>
+
     <update id="cancelAlarmByNewRecord" flushCache="true">
         UPDATE alarm_records ar
         <set>