diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index f11ceb6..14b9719 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -45,11 +45,11 @@
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(wellCoverDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -73,12 +73,11 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
     /**
@@ -100,11 +99,11 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -128,34 +127,36 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
-    //@Permission
+    @Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        deviceDataExcelDtoList.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(deviceDataExcelDtoList);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list-page")
-    //@Permission
+    @Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -171,7 +172,7 @@
      * @throws IOException
      */
     @GetMapping(value = "/tubedata/export")
-    //@Permission
+    @Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -181,7 +182,6 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
         List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
         tubeDatalist.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -199,7 +199,6 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
-
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -228,8 +227,11 @@
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(harmfulDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -251,8 +253,8 @@
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        harmfulDataDtoList.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        harmfulDataDtoList.forEach(harmfulDataDto -> {
+            harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid()));
         });
         //TODO 导出表头设置
         super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
@@ -272,6 +274,9 @@
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        mapList.forEach(temhumDataDto -> {
+            temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid()));
+        });
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -290,8 +295,11 @@
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(temppressDataDto -> {
+            temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid()));
+        });
+        page.setRecords(temppressDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -362,8 +370,11 @@
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -383,7 +394,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -406,8 +416,11 @@
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(wellAppointDataDto -> {
+            wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid()));
+        });
+        page.setRecords(wellAppointDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -427,7 +440,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         wellAppointDataDtoList.forEach(deviceDto -> {
@@ -450,8 +462,11 @@
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -471,7 +486,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -515,8 +529,12 @@
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -572,6 +590,9 @@
         }
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        mapList.forEach(deviceDto -> {
+            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+        });
         return ResponseData.success(mapList);
     }
 

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index f11ceb6..14b9719 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -45,11 +45,11 @@
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(wellCoverDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -73,12 +73,11 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
     /**
@@ -100,11 +99,11 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -128,34 +127,36 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
-    //@Permission
+    @Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        deviceDataExcelDtoList.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(deviceDataExcelDtoList);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list-page")
-    //@Permission
+    @Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -171,7 +172,7 @@
      * @throws IOException
      */
     @GetMapping(value = "/tubedata/export")
-    //@Permission
+    @Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -181,7 +182,6 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
         List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
         tubeDatalist.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -199,7 +199,6 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
-
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -228,8 +227,11 @@
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(harmfulDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -251,8 +253,8 @@
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        harmfulDataDtoList.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        harmfulDataDtoList.forEach(harmfulDataDto -> {
+            harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid()));
         });
         //TODO 导出表头设置
         super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
@@ -272,6 +274,9 @@
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        mapList.forEach(temhumDataDto -> {
+            temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid()));
+        });
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -290,8 +295,11 @@
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(temppressDataDto -> {
+            temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid()));
+        });
+        page.setRecords(temppressDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -362,8 +370,11 @@
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -383,7 +394,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -406,8 +416,11 @@
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(wellAppointDataDto -> {
+            wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid()));
+        });
+        page.setRecords(wellAppointDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -427,7 +440,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         wellAppointDataDtoList.forEach(deviceDto -> {
@@ -450,8 +462,11 @@
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -471,7 +486,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -515,8 +529,12 @@
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -572,6 +590,9 @@
         }
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        mapList.forEach(deviceDto -> {
+            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+        });
         return ResponseData.success(mapList);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index b15381c..9661388 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -35,7 +35,7 @@
     /**
      * 第三方燃气列表
      */
-    @RequestMapping("/gasdector/listpage")
+    @RequestMapping("/gasdector/list-page")
     public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -62,7 +62,7 @@
     /**
      * 第三方甲烷列表
      */
-    @RequestMapping("/pantilt/listpage")
+    @RequestMapping("/pantilt/list-page")
     public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index f11ceb6..14b9719 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -45,11 +45,11 @@
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(wellCoverDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -73,12 +73,11 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
     /**
@@ -100,11 +99,11 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -128,34 +127,36 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
-    //@Permission
+    @Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        deviceDataExcelDtoList.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(deviceDataExcelDtoList);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list-page")
-    //@Permission
+    @Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -171,7 +172,7 @@
      * @throws IOException
      */
     @GetMapping(value = "/tubedata/export")
-    //@Permission
+    @Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -181,7 +182,6 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
         List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
         tubeDatalist.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -199,7 +199,6 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
-
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -228,8 +227,11 @@
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(harmfulDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -251,8 +253,8 @@
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        harmfulDataDtoList.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        harmfulDataDtoList.forEach(harmfulDataDto -> {
+            harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid()));
         });
         //TODO 导出表头设置
         super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
@@ -272,6 +274,9 @@
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        mapList.forEach(temhumDataDto -> {
+            temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid()));
+        });
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -290,8 +295,11 @@
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(temppressDataDto -> {
+            temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid()));
+        });
+        page.setRecords(temppressDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -362,8 +370,11 @@
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -383,7 +394,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -406,8 +416,11 @@
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(wellAppointDataDto -> {
+            wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid()));
+        });
+        page.setRecords(wellAppointDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -427,7 +440,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         wellAppointDataDtoList.forEach(deviceDto -> {
@@ -450,8 +462,11 @@
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -471,7 +486,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -515,8 +529,12 @@
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -572,6 +590,9 @@
         }
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        mapList.forEach(deviceDto -> {
+            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+        });
         return ResponseData.success(mapList);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index b15381c..9661388 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -35,7 +35,7 @@
     /**
      * 第三方燃气列表
      */
-    @RequestMapping("/gasdector/listpage")
+    @RequestMapping("/gasdector/list-page")
     public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -62,7 +62,7 @@
     /**
      * 第三方甲烷列表
      */
-    @RequestMapping("/pantilt/listpage")
+    @RequestMapping("/pantilt/list-page")
     public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 49681d5..3245bcb 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -829,7 +829,7 @@
         dhg.CH4 AS "CH4",
         dhg.H2S AS "H2S",
         dhg.O2 AS "O2",
-        dhg.SWITCH AS switchStart,
+        dhg.SWITCH AS "liquidSwitch",
         <include refid="date_toChar">
             <property name="paramTime" value="dhg.UPTIME"/>
         </include>

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index f11ceb6..14b9719 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -45,11 +45,11 @@
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(wellCoverDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -73,12 +73,11 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
     /**
@@ -100,11 +99,11 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -128,34 +127,36 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
-    //@Permission
+    @Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        deviceDataExcelDtoList.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(deviceDataExcelDtoList);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list-page")
-    //@Permission
+    @Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -171,7 +172,7 @@
      * @throws IOException
      */
     @GetMapping(value = "/tubedata/export")
-    //@Permission
+    @Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -181,7 +182,6 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
         List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
         tubeDatalist.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -199,7 +199,6 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
-
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -228,8 +227,11 @@
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(harmfulDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -251,8 +253,8 @@
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        harmfulDataDtoList.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        harmfulDataDtoList.forEach(harmfulDataDto -> {
+            harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid()));
         });
         //TODO 导出表头设置
         super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
@@ -272,6 +274,9 @@
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        mapList.forEach(temhumDataDto -> {
+            temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid()));
+        });
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -290,8 +295,11 @@
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(temppressDataDto -> {
+            temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid()));
+        });
+        page.setRecords(temppressDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -362,8 +370,11 @@
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -383,7 +394,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -406,8 +416,11 @@
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(wellAppointDataDto -> {
+            wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid()));
+        });
+        page.setRecords(wellAppointDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -427,7 +440,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         wellAppointDataDtoList.forEach(deviceDto -> {
@@ -450,8 +462,11 @@
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -471,7 +486,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -515,8 +529,12 @@
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -572,6 +590,9 @@
         }
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        mapList.forEach(deviceDto -> {
+            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+        });
         return ResponseData.success(mapList);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index b15381c..9661388 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -35,7 +35,7 @@
     /**
      * 第三方燃气列表
      */
-    @RequestMapping("/gasdector/listpage")
+    @RequestMapping("/gasdector/list-page")
     public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -62,7 +62,7 @@
     /**
      * 第三方甲烷列表
      */
-    @RequestMapping("/pantilt/listpage")
+    @RequestMapping("/pantilt/list-page")
     public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 49681d5..3245bcb 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -829,7 +829,7 @@
         dhg.CH4 AS "CH4",
         dhg.H2S AS "H2S",
         dhg.O2 AS "O2",
-        dhg.SWITCH AS switchStart,
+        dhg.SWITCH AS "liquidSwitch",
         <include refid="date_toChar">
             <property name="paramTime" value="dhg.UPTIME"/>
         </include>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e2104a4..417d274 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -24,7 +24,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
+    List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index f11ceb6..14b9719 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -45,11 +45,11 @@
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(wellCoverDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -73,12 +73,11 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
     /**
@@ -100,11 +99,11 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -128,34 +127,36 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
-    //@Permission
+    @Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        deviceDataExcelDtoList.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(deviceDataExcelDtoList);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list-page")
-    //@Permission
+    @Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -171,7 +172,7 @@
      * @throws IOException
      */
     @GetMapping(value = "/tubedata/export")
-    //@Permission
+    @Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -181,7 +182,6 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
         List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
         tubeDatalist.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -199,7 +199,6 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
-
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -228,8 +227,11 @@
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(harmfulDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -251,8 +253,8 @@
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        harmfulDataDtoList.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        harmfulDataDtoList.forEach(harmfulDataDto -> {
+            harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid()));
         });
         //TODO 导出表头设置
         super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
@@ -272,6 +274,9 @@
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        mapList.forEach(temhumDataDto -> {
+            temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid()));
+        });
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -290,8 +295,11 @@
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(temppressDataDto -> {
+            temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid()));
+        });
+        page.setRecords(temppressDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -362,8 +370,11 @@
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -383,7 +394,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -406,8 +416,11 @@
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(wellAppointDataDto -> {
+            wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid()));
+        });
+        page.setRecords(wellAppointDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -427,7 +440,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         wellAppointDataDtoList.forEach(deviceDto -> {
@@ -450,8 +462,11 @@
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -471,7 +486,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -515,8 +529,12 @@
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -572,6 +590,9 @@
         }
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        mapList.forEach(deviceDto -> {
+            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+        });
         return ResponseData.success(mapList);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index b15381c..9661388 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -35,7 +35,7 @@
     /**
      * 第三方燃气列表
      */
-    @RequestMapping("/gasdector/listpage")
+    @RequestMapping("/gasdector/list-page")
     public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -62,7 +62,7 @@
     /**
      * 第三方甲烷列表
      */
-    @RequestMapping("/pantilt/listpage")
+    @RequestMapping("/pantilt/list-page")
     public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 49681d5..3245bcb 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -829,7 +829,7 @@
         dhg.CH4 AS "CH4",
         dhg.H2S AS "H2S",
         dhg.O2 AS "O2",
-        dhg.SWITCH AS switchStart,
+        dhg.SWITCH AS "liquidSwitch",
         <include refid="date_toChar">
             <property name="paramTime" value="dhg.UPTIME"/>
         </include>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e2104a4..417d274 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -24,7 +24,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
+    List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 0974260..09ff2ff 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -183,7 +183,7 @@
         ORDER BY INSTALLDATE DESC
     </select>
 
-    <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
+    <select id="getDeviceListInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
                deviceName,

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index f11ceb6..14b9719 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -45,11 +45,11 @@
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(wellCoverDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -73,12 +73,11 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
     /**
@@ -100,11 +99,11 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -128,34 +127,36 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
-    //@Permission
+    @Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        deviceDataExcelDtoList.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(deviceDataExcelDtoList);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list-page")
-    //@Permission
+    @Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -171,7 +172,7 @@
      * @throws IOException
      */
     @GetMapping(value = "/tubedata/export")
-    //@Permission
+    @Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -181,7 +182,6 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
         List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
         tubeDatalist.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -199,7 +199,6 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
-
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -228,8 +227,11 @@
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(harmfulDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -251,8 +253,8 @@
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        harmfulDataDtoList.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        harmfulDataDtoList.forEach(harmfulDataDto -> {
+            harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid()));
         });
         //TODO 导出表头设置
         super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
@@ -272,6 +274,9 @@
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        mapList.forEach(temhumDataDto -> {
+            temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid()));
+        });
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -290,8 +295,11 @@
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(temppressDataDto -> {
+            temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid()));
+        });
+        page.setRecords(temppressDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -362,8 +370,11 @@
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -383,7 +394,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -406,8 +416,11 @@
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(wellAppointDataDto -> {
+            wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid()));
+        });
+        page.setRecords(wellAppointDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -427,7 +440,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         wellAppointDataDtoList.forEach(deviceDto -> {
@@ -450,8 +462,11 @@
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -471,7 +486,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -515,8 +529,12 @@
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -572,6 +590,9 @@
         }
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        mapList.forEach(deviceDto -> {
+            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+        });
         return ResponseData.success(mapList);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index b15381c..9661388 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -35,7 +35,7 @@
     /**
      * 第三方燃气列表
      */
-    @RequestMapping("/gasdector/listpage")
+    @RequestMapping("/gasdector/list-page")
     public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -62,7 +62,7 @@
     /**
      * 第三方甲烷列表
      */
-    @RequestMapping("/pantilt/listpage")
+    @RequestMapping("/pantilt/list-page")
     public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 49681d5..3245bcb 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -829,7 +829,7 @@
         dhg.CH4 AS "CH4",
         dhg.H2S AS "H2S",
         dhg.O2 AS "O2",
-        dhg.SWITCH AS switchStart,
+        dhg.SWITCH AS "liquidSwitch",
         <include refid="date_toChar">
             <property name="paramTime" value="dhg.UPTIME"/>
         </include>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e2104a4..417d274 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -24,7 +24,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
+    List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 0974260..09ff2ff 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -183,7 +183,7 @@
         ORDER BY INSTALLDATE DESC
     </select>
 
-    <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
+    <select id="getDeviceListInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
                deviceName,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 77d3da6..4a78066 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -388,7 +388,7 @@
 
     @Override
     public List<DeviceInfoDto> getDeviceList(DataScope dataScope) {
-        return this.baseMapper.getDeviceList(dataScope);
+        return this.baseMapper.getDeviceListInfo(dataScope);
     }
 
     @Override

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index f11ceb6..14b9719 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -45,11 +45,11 @@
         Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(wellCoverDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -73,12 +73,11 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<WellCoverDataDto> wellCoverDataDtoList = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellCoverDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
     /**
@@ -100,11 +99,11 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(list);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -128,34 +127,36 @@
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
-        list.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
-    //@Permission
+    @Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        deviceDataExcelDtoList.forEach(deviceDto -> {
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        page.setRecords(deviceDataExcelDtoList);
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list-page")
-    //@Permission
+    @Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -171,7 +172,7 @@
      * @throws IOException
      */
     @GetMapping(value = "/tubedata/export")
-    //@Permission
+    @Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -181,7 +182,6 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
         List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-
         tubeDatalist.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -199,7 +199,6 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
-
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
@@ -228,8 +227,11 @@
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(harmfulDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -251,8 +253,8 @@
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        harmfulDataDtoList.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        harmfulDataDtoList.forEach(harmfulDataDto -> {
+            harmfulDataDto.setDeptName(permissionService.getDeptService().getDeptName(harmfulDataDto.getDeptid()));
         });
         //TODO 导出表头设置
         super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
@@ -272,6 +274,9 @@
         Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        mapList.forEach(temhumDataDto -> {
+            temhumDataDto.setDeptName(permissionService.getDeptService().getDeptName(temhumDataDto.getDeptid()));
+        });
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -290,8 +295,11 @@
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(temppressDataDto -> {
+            temppressDataDto.setDeptName(permissionService.getDeptService().getDeptName(temppressDataDto.getDeptid()));
+        });
+        page.setRecords(temppressDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -362,8 +370,11 @@
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -383,7 +394,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -406,8 +416,11 @@
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(wellAppointDataDto -> {
+            wellAppointDataDto.setDeptName(permissionService.getDeptService().getDeptName(wellAppointDataDto.getDeptid()));
+        });
+        page.setRecords(wellAppointDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -427,7 +440,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         wellAppointDataDtoList.forEach(deviceDto -> {
@@ -450,8 +462,11 @@
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
         Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(digNoiseDataDto -> {
+            digNoiseDataDto.setDeptName(permissionService.getDeptService().getDeptName(digNoiseDataDto.getDeptid()));
+        });
+        page.setRecords(digNoiseDataDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -471,7 +486,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         digNoiseDataDtoList.forEach(deviceDto -> {
@@ -515,8 +529,12 @@
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
@@ -572,6 +590,9 @@
         }
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        mapList.forEach(deviceDto -> {
+            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+        });
         return ResponseData.success(mapList);
     }
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index b15381c..9661388 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -35,7 +35,7 @@
     /**
      * 第三方燃气列表
      */
-    @RequestMapping("/gasdector/listpage")
+    @RequestMapping("/gasdector/list-page")
     public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
@@ -62,7 +62,7 @@
     /**
      * 第三方甲烷列表
      */
-    @RequestMapping("/pantilt/listpage")
+    @RequestMapping("/pantilt/list-page")
     public Object getPantiltDataListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 49681d5..3245bcb 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -829,7 +829,7 @@
         dhg.CH4 AS "CH4",
         dhg.H2S AS "H2S",
         dhg.O2 AS "O2",
-        dhg.SWITCH AS switchStart,
+        dhg.SWITCH AS "liquidSwitch",
         <include refid="date_toChar">
             <property name="paramTime" value="dhg.UPTIME"/>
         </include>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e2104a4..417d274 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -24,7 +24,7 @@
 
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
+    List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 0974260..09ff2ff 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -183,7 +183,7 @@
         ORDER BY INSTALLDATE DESC
     </select>
 
-    <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
+    <select id="getDeviceListInfo" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
                deviceName,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 77d3da6..4a78066 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -388,7 +388,7 @@
 
     @Override
     public List<DeviceInfoDto> getDeviceList(DataScope dataScope) {
-        return this.baseMapper.getDeviceList(dataScope);
+        return this.baseMapper.getDeviceListInfo(dataScope);
     }
 
     @Override
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
index 67c0b9b..854447b 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -48,7 +48,7 @@
     @JSONField(name="H2S")
     private String H2S;
     @ExcelProperty("液位开关")
-    private String switchStart;
+    private String liquidSwitch;
     @ExcelProperty("采集时间")
     private String uptime;
     @ExcelProperty("记录时间")