diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
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 3a8c3f7..633ee7d 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
@@ -80,7 +80,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
         if (roleTipes.contains("leader") || roleTipes.contains("member")) {
-            dataScope.setScopeName("responsibleDept");
+            dataScope.setScopeName("responsible_dept");
             List<Long> responsibleDeptIds = new ArrayList<>();
             responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index d1c7b27..f1336d9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -288,7 +288,7 @@
     </select>
 
     <select id="countByResponse" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
@@ -324,7 +324,7 @@
     </select>
 
     <select id="countByUser" resultType="java.lang.Integer">
-        SELECT COUNT( DISTINCT AJ.ID )
+        SELECT COUNT( DISTINCT aj.ID )
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON ar.JOB_ID = aj.ID
         LEFT JOIN bus_well_info bwi ON aj.WELL_CODE = bwi.WELL_CODE
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index c33ec7d..554eca1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -36,7 +36,6 @@
         }
         SuccessResponseData resultData = new SuccessResponseData();
         resultData.setData(dataAnalysisService.getWatchDatas(id));
-
         return resultData;
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0accf94..ed84f3e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -43,12 +43,15 @@
 
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
     DeviceData lgGasData(@Param("devcode") String devcode);
+
     /**
      * 燃气液位
+     *
      * @param devcode
      * @return
      */
@@ -57,24 +60,36 @@
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
+
+    List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId") Long deptId, @Param("searchCurr") Boolean searchCurr);
+
     List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 }
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 3a8c3f7..633ee7d 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
@@ -80,7 +80,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         Set<String> roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips();
         if (roleTipes.contains("leader") || roleTipes.contains("member")) {
-            dataScope.setScopeName("responsibleDept");
+            dataScope.setScopeName("responsible_dept");
             List<Long> responsibleDeptIds = new ArrayList<>();
             responsibleDeptIds.add(permissionService.getAuthService().getLoginUser().getDeptId());
             dataScope.setDeptIds(responsibleDeptIds);
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index bdf2415..916cffd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -34,7 +34,7 @@
         LNG_BAIDU AS "lngBaidu", LNG_GAODE AS "lngGaode", LAT_GAODE AS "latGaode", AREA AS area,
          POSITION AS position, DEPTID AS deptid, PHOTOS AS photos, NOTES AS notes,
          WELL_TYPE AS "wellType", STAFF AS staff, TEL AS tel, TS AS ts, VALID AS valid,
-          BFZT AS bfzt, RESPONSIBLE_DEPT AS "responsibleDept"
+          BFZT AS bfzt,RESPONSIBLE_DEPT AS "responsibleDept"
     </sql>
 
     <sql id="Info_Column_List">