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 55d6989..7d0ad2e 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
@@ -128,7 +128,6 @@
     public Object cancelAlarm(@RequestParam(value = "id", required = true) long id, //jobId
                               @RequestParam(value = "jobStatus", required = true) String jobStatus,
                               @RequestParam(value = "handleMessage", required = true) String handleMessage) {
-        Map<String, Object> retMap = new HashMap<>();
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         boolean isCancel = alarmRecordsService.cancelAlarm(id, jobStatus, handleMessage, currentUser.getId());
         if (isCancel) {
@@ -153,7 +152,7 @@
                               @RequestParam(value = "wellName", required = false) String wellName,
                               @RequestParam(value = "jobStatus", required = true) String jobStatus,
                               @RequestParam(value = "handleMessage", required = true) String handleMessage) {
-        Map<String, Object> retMap = new HashMap<>();
+
 
         //根据查询条件查询alarm_record记录
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
@@ -164,8 +163,6 @@
         for (AlarmRecords alarmRecord : alarmRecords) {
             alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.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 55d6989..7d0ad2e 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
@@ -128,7 +128,6 @@
     public Object cancelAlarm(@RequestParam(value = "id", required = true) long id, //jobId
                               @RequestParam(value = "jobStatus", required = true) String jobStatus,
                               @RequestParam(value = "handleMessage", required = true) String handleMessage) {
-        Map<String, Object> retMap = new HashMap<>();
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         boolean isCancel = alarmRecordsService.cancelAlarm(id, jobStatus, handleMessage, currentUser.getId());
         if (isCancel) {
@@ -153,7 +152,7 @@
                               @RequestParam(value = "wellName", required = false) String wellName,
                               @RequestParam(value = "jobStatus", required = true) String jobStatus,
                               @RequestParam(value = "handleMessage", required = true) String handleMessage) {
-        Map<String, Object> retMap = new HashMap<>();
+
 
         //根据查询条件查询alarm_record记录
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
@@ -164,8 +163,6 @@
         for (AlarmRecords alarmRecord : alarmRecords) {
             alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
-
-
         return ResponseData.success();
     }
 
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 4a95d42..06fe095 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
@@ -206,7 +206,7 @@
     <select id="countAlarmsByDay" resultType="map">
         SELECT
         COUNT(*) AS alarmTimes,
-        COUNT(DISTINCT a.WELL_CODE) AS alarmWells
+        COUNT(DISTINCT w.ID) AS alarmWells
         FROM
         alarm_records a
         left join bus_well_info w on a.WELL_CODE = w.WELL_CODE

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 55d6989..7d0ad2e 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
@@ -128,7 +128,6 @@
     public Object cancelAlarm(@RequestParam(value = "id", required = true) long id, //jobId
                               @RequestParam(value = "jobStatus", required = true) String jobStatus,
                               @RequestParam(value = "handleMessage", required = true) String handleMessage) {
-        Map<String, Object> retMap = new HashMap<>();
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         boolean isCancel = alarmRecordsService.cancelAlarm(id, jobStatus, handleMessage, currentUser.getId());
         if (isCancel) {
@@ -153,7 +152,7 @@
                               @RequestParam(value = "wellName", required = false) String wellName,
                               @RequestParam(value = "jobStatus", required = true) String jobStatus,
                               @RequestParam(value = "handleMessage", required = true) String handleMessage) {
-        Map<String, Object> retMap = new HashMap<>();
+
 
         //根据查询条件查询alarm_record记录
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
@@ -164,8 +163,6 @@
         for (AlarmRecords alarmRecord : alarmRecords) {
             alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
-
-
         return ResponseData.success();
     }
 
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 4a95d42..06fe095 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
@@ -206,7 +206,7 @@
     <select id="countAlarmsByDay" resultType="map">
         SELECT
         COUNT(*) AS alarmTimes,
-        COUNT(DISTINCT a.WELL_CODE) AS alarmWells
+        COUNT(DISTINCT w.ID) AS alarmWells
         FROM
         alarm_records a
         left join bus_well_info w on a.WELL_CODE = w.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index e3fba0c..5bf0cd5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -19,21 +19,7 @@
     <sql id="Base_Column_List">
         ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts
     </sql>
-    <!--"id":5,-->
-    <!--"wellId":666,-->
-    <!--"wellCode":"N57F141",-->
-    <!--"wellName":"井名称",-->
-    <!--"deviceId":46,-->
-    <!--"devcode":"112018030012",-->
-    <!--"deviceType":2,-->
-    <!--"deviceTypeName":"液位监测仪",-->
-    <!--"deptid":"27",-->
-    <!--"deptName":"一分公司",-->
-    <!--"deep":3.00,-->
-    <!--"highValue":3.12,-->
-    <!--"lowValue":0.00,-->
-    <!--"ts":"2018-12-22 00:00:00",-->
-    <!--"user":"1"-->
+
     <select id="ruleListViaParam" resultType="map">
         SELECT ar.ID as id,ar.HIGHVALUE as highValue,ar.LOWVALUE as lowValue,
         bd.ID AS devId,bd.DEVCODE as devcode,

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 55d6989..7d0ad2e 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
@@ -128,7 +128,6 @@
     public Object cancelAlarm(@RequestParam(value = "id", required = true) long id, //jobId
                               @RequestParam(value = "jobStatus", required = true) String jobStatus,
                               @RequestParam(value = "handleMessage", required = true) String handleMessage) {
-        Map<String, Object> retMap = new HashMap<>();
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         boolean isCancel = alarmRecordsService.cancelAlarm(id, jobStatus, handleMessage, currentUser.getId());
         if (isCancel) {
@@ -153,7 +152,7 @@
                               @RequestParam(value = "wellName", required = false) String wellName,
                               @RequestParam(value = "jobStatus", required = true) String jobStatus,
                               @RequestParam(value = "handleMessage", required = true) String handleMessage) {
-        Map<String, Object> retMap = new HashMap<>();
+
 
         //根据查询条件查询alarm_record记录
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
@@ -164,8 +163,6 @@
         for (AlarmRecords alarmRecord : alarmRecords) {
             alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
-
-
         return ResponseData.success();
     }
 
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 4a95d42..06fe095 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
@@ -206,7 +206,7 @@
     <select id="countAlarmsByDay" resultType="map">
         SELECT
         COUNT(*) AS alarmTimes,
-        COUNT(DISTINCT a.WELL_CODE) AS alarmWells
+        COUNT(DISTINCT w.ID) AS alarmWells
         FROM
         alarm_records a
         left join bus_well_info w on a.WELL_CODE = w.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index e3fba0c..5bf0cd5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -19,21 +19,7 @@
     <sql id="Base_Column_List">
         ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts
     </sql>
-    <!--"id":5,-->
-    <!--"wellId":666,-->
-    <!--"wellCode":"N57F141",-->
-    <!--"wellName":"井名称",-->
-    <!--"deviceId":46,-->
-    <!--"devcode":"112018030012",-->
-    <!--"deviceType":2,-->
-    <!--"deviceTypeName":"液位监测仪",-->
-    <!--"deptid":"27",-->
-    <!--"deptName":"一分公司",-->
-    <!--"deep":3.00,-->
-    <!--"highValue":3.12,-->
-    <!--"lowValue":0.00,-->
-    <!--"ts":"2018-12-22 00:00:00",-->
-    <!--"user":"1"-->
+
     <select id="ruleListViaParam" resultType="map">
         SELECT ar.ID as id,ar.HIGHVALUE as highValue,ar.LOWVALUE as lowValue,
         bd.ID AS devId,bd.DEVCODE as devcode,
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index cd5e5fa..c53fe13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -12,24 +12,7 @@
         ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A
         LEFT JOIN sys_dept SD ON A.DEPTID = SD.id
     </select>
-    <!--SELECT-->
-    <!--A.wellCount ,-->
-    <!--A.deptid,-->
-    <!--SD.simplename as deptName,-->
-    <!--SD.pid-->
-    <!--FROM-->
-    <!--(-->
-    <!--SELECT-->
-    <!--COUNT( 1 ) AS wellCount,-->
-    <!--a.DEPTID AS deptid-->
-    <!--FROM-->
-    <!--bus_well_info a-->
-    <!--WHERE-->
-    <!--a.VALID = '1'-->
-    <!--AND EXISTS ( SELECT 1 FROM bus_device_well b WHERE b.well_id = a.id AND a.VALID = '1' )-->
-    <!--GROUP BY a.DEPTID-->
-    <!--) A-->
-    <!--LEFT JOIN sys_dept SD ON A.DEPTID = SD.id-->
+
     <select id="wellStaticsByType" resultType="map">
         SELECT
             COUNT( 1 ) AS wellCount,

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 55d6989..7d0ad2e 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
@@ -128,7 +128,6 @@
     public Object cancelAlarm(@RequestParam(value = "id", required = true) long id, //jobId
                               @RequestParam(value = "jobStatus", required = true) String jobStatus,
                               @RequestParam(value = "handleMessage", required = true) String handleMessage) {
-        Map<String, Object> retMap = new HashMap<>();
         ShiroUser currentUser = iCommonPermissionService.getCurrLoginUser();
         boolean isCancel = alarmRecordsService.cancelAlarm(id, jobStatus, handleMessage, currentUser.getId());
         if (isCancel) {
@@ -153,7 +152,7 @@
                               @RequestParam(value = "wellName", required = false) String wellName,
                               @RequestParam(value = "jobStatus", required = true) String jobStatus,
                               @RequestParam(value = "handleMessage", required = true) String handleMessage) {
-        Map<String, Object> retMap = new HashMap<>();
+
 
         //根据查询条件查询alarm_record记录
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();
@@ -164,8 +163,6 @@
         for (AlarmRecords alarmRecord : alarmRecords) {
             alarmRecordsService.cancelAlarm(alarmRecord.getId(), jobStatus, handleMessage, currentUser.getId());
         }
-
-
         return ResponseData.success();
     }
 
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 4a95d42..06fe095 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
@@ -206,7 +206,7 @@
     <select id="countAlarmsByDay" resultType="map">
         SELECT
         COUNT(*) AS alarmTimes,
-        COUNT(DISTINCT a.WELL_CODE) AS alarmWells
+        COUNT(DISTINCT w.ID) AS alarmWells
         FROM
         alarm_records a
         left join bus_well_info w on a.WELL_CODE = w.WELL_CODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index e3fba0c..5bf0cd5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -19,21 +19,7 @@
     <sql id="Base_Column_List">
         ID AS id, DEVCODE AS devcode, HIGHVALUE AS highvalue, LOWVALUE AS lowvalue, OVERTIME AS overtime, SALTATION AS saltation, SENSORCODE AS sensorcode, GRADE AS grade, TS AS ts
     </sql>
-    <!--"id":5,-->
-    <!--"wellId":666,-->
-    <!--"wellCode":"N57F141",-->
-    <!--"wellName":"井名称",-->
-    <!--"deviceId":46,-->
-    <!--"devcode":"112018030012",-->
-    <!--"deviceType":2,-->
-    <!--"deviceTypeName":"液位监测仪",-->
-    <!--"deptid":"27",-->
-    <!--"deptName":"一分公司",-->
-    <!--"deep":3.00,-->
-    <!--"highValue":3.12,-->
-    <!--"lowValue":0.00,-->
-    <!--"ts":"2018-12-22 00:00:00",-->
-    <!--"user":"1"-->
+
     <select id="ruleListViaParam" resultType="map">
         SELECT ar.ID as id,ar.HIGHVALUE as highValue,ar.LOWVALUE as lowValue,
         bd.ID AS devId,bd.DEVCODE as devcode,
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index cd5e5fa..c53fe13 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -12,24 +12,7 @@
         ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A
         LEFT JOIN sys_dept SD ON A.DEPTID = SD.id
     </select>
-    <!--SELECT-->
-    <!--A.wellCount ,-->
-    <!--A.deptid,-->
-    <!--SD.simplename as deptName,-->
-    <!--SD.pid-->
-    <!--FROM-->
-    <!--(-->
-    <!--SELECT-->
-    <!--COUNT( 1 ) AS wellCount,-->
-    <!--a.DEPTID AS deptid-->
-    <!--FROM-->
-    <!--bus_well_info a-->
-    <!--WHERE-->
-    <!--a.VALID = '1'-->
-    <!--AND EXISTS ( SELECT 1 FROM bus_device_well b WHERE b.well_id = a.id AND a.VALID = '1' )-->
-    <!--GROUP BY a.DEPTID-->
-    <!--) A-->
-    <!--LEFT JOIN sys_dept SD ON A.DEPTID = SD.id-->
+
     <select id="wellStaticsByType" resultType="map">
         SELECT
             COUNT( 1 ) AS wellCount,
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 6c2b464..bb0b276 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -271,7 +271,7 @@
             isApp = false;
         }
         SuccessResponseData resultData = new SuccessResponseData();
-        busWellInfoService.getBfztCountData(deptIds, isApp);
+//        busWellInfoService.getBfztCountData(deptIds, isApp);
 
 
         resultData.setData(busWellInfoService.getBfztCountData(deptIds, isApp));