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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
index e40e025..5c52839 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -1,4 +1,4 @@
-package com.casic.missiles.modular.system.enmus;
+package com.casic.missiles.modular.system.enums;
 
 
 import java.util.HashMap;

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
index e40e025..5c52839 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -1,4 +1,4 @@
-package com.casic.missiles.modular.system.enmus;
+package com.casic.missiles.modular.system.enums;
 
 
 import java.util.HashMap;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index e198987..bb21265 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -132,7 +132,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
     /**

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
index e40e025..5c52839 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -1,4 +1,4 @@
-package com.casic.missiles.modular.system.enmus;
+package com.casic.missiles.modular.system.enums;
 
 
 import java.util.HashMap;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index e198987..bb21265 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -132,7 +132,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
index 0b19af8..5b2bbff 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
@@ -164,7 +164,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     private String valid;
     /**
      * 布防状态

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
index e40e025..5c52839 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -1,4 +1,4 @@
-package com.casic.missiles.modular.system.enmus;
+package com.casic.missiles.modular.system.enums;
 
 
 import java.util.HashMap;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index e198987..bb21265 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -132,7 +132,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
index 0b19af8..5b2bbff 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
@@ -164,7 +164,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     private String valid;
     /**
      * 布防状态
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index 397d202..479eeb3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -30,6 +30,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+
 @ColumnWidth(30)
 @HeadRowHeight(15)
 @ContentRowHeight(20)
@@ -54,6 +55,7 @@
     /**
      * 设备名称
      */
+    @ExcelProperty("设备名称")
     @TableField("DEVICE_NAME")
     private String deviceName;
     /**
@@ -64,6 +66,7 @@
     /**
      * 设备类型
      */
+
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
@@ -109,9 +112,13 @@
     //集中器ID
     @TableField(exist = false)
     private Long concenId;
+
     @TableField(exist = false)
     private String installDateFmt;
 
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
     @Override
     public String toString() {
         return "Device{" +

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
index e40e025..5c52839 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -1,4 +1,4 @@
-package com.casic.missiles.modular.system.enmus;
+package com.casic.missiles.modular.system.enums;
 
 
 import java.util.HashMap;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index e198987..bb21265 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -132,7 +132,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
index 0b19af8..5b2bbff 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
@@ -164,7 +164,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     private String valid;
     /**
      * 布防状态
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index 397d202..479eeb3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -30,6 +30,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+
 @ColumnWidth(30)
 @HeadRowHeight(15)
 @ContentRowHeight(20)
@@ -54,6 +55,7 @@
     /**
      * 设备名称
      */
+    @ExcelProperty("设备名称")
     @TableField("DEVICE_NAME")
     private String deviceName;
     /**
@@ -64,6 +66,7 @@
     /**
      * 设备类型
      */
+
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
@@ -109,9 +112,13 @@
     //集中器ID
     @TableField(exist = false)
     private Long concenId;
+
     @TableField(exist = false)
     private String installDateFmt;
 
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
     @Override
     public String toString() {
         return "Device{" +
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
index 1419662..f7e5a1e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
@@ -41,7 +41,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("ACTIVE")
     private Integer active;
     /**

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
index e40e025..5c52839 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -1,4 +1,4 @@
-package com.casic.missiles.modular.system.enmus;
+package com.casic.missiles.modular.system.enums;
 
 
 import java.util.HashMap;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index e198987..bb21265 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -132,7 +132,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
index 0b19af8..5b2bbff 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
@@ -164,7 +164,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     private String valid;
     /**
      * 布防状态
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index 397d202..479eeb3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -30,6 +30,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+
 @ColumnWidth(30)
 @HeadRowHeight(15)
 @ContentRowHeight(20)
@@ -54,6 +55,7 @@
     /**
      * 设备名称
      */
+    @ExcelProperty("设备名称")
     @TableField("DEVICE_NAME")
     private String deviceName;
     /**
@@ -64,6 +66,7 @@
     /**
      * 设备类型
      */
+
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
@@ -109,9 +112,13 @@
     //集中器ID
     @TableField(exist = false)
     private Long concenId;
+
     @TableField(exist = false)
     private String installDateFmt;
 
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
     @Override
     public String toString() {
         return "Device{" +
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
index 1419662..f7e5a1e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
@@ -41,7 +41,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("ACTIVE")
     private Integer active;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
index 6c4398f..22c3166 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
@@ -42,7 +42,6 @@
     /**
      * 是否有效：1有效，0无效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
 

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
index e40e025..5c52839 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -1,4 +1,4 @@
-package com.casic.missiles.modular.system.enmus;
+package com.casic.missiles.modular.system.enums;
 
 
 import java.util.HashMap;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index e198987..bb21265 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -132,7 +132,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
index 0b19af8..5b2bbff 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
@@ -164,7 +164,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     private String valid;
     /**
      * 布防状态
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index 397d202..479eeb3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -30,6 +30,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+
 @ColumnWidth(30)
 @HeadRowHeight(15)
 @ContentRowHeight(20)
@@ -54,6 +55,7 @@
     /**
      * 设备名称
      */
+    @ExcelProperty("设备名称")
     @TableField("DEVICE_NAME")
     private String deviceName;
     /**
@@ -64,6 +66,7 @@
     /**
      * 设备类型
      */
+
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
@@ -109,9 +112,13 @@
     //集中器ID
     @TableField(exist = false)
     private Long concenId;
+
     @TableField(exist = false)
     private String installDateFmt;
 
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
     @Override
     public String toString() {
         return "Device{" +
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
index 1419662..f7e5a1e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
@@ -41,7 +41,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("ACTIVE")
     private Integer active;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
index 6c4398f..22c3166 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
@@ -42,7 +42,6 @@
     /**
      * 是否有效：1有效，0无效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 2d65755..f8d2cfd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -170,21 +170,17 @@
         if (null == busWellInfo.getId()) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-
         BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId());
         LogObjectHolder.me().set(oldBusWellInfo);
 
         Utility.convertCoordinate(busWellInfo);
-
         if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){
             busWellInfo.setResponsibleDept(busWellInfo.getDeptid());
         }
-
 //        List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
 //        if(ToolUtil.isNotEmpty(deptTopRoleUsers)){
 //            busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString());
 //        }
-
         busWellInfoService.updateById(busWellInfo);
         return ResponseData.success();
     }
@@ -215,11 +211,6 @@
         return resultData;
     }
 
-
-
-
-
-
     /**
      * 闸井布防撤防接口
      */
@@ -229,11 +220,7 @@
         if (null ==wellId || StrUtil.isEmpty(bfzt)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-
-        BusWellInfo busWellInfo = new BusWellInfo();
-        busWellInfo.setId(wellId);
-        busWellInfo.setBfzt(bfzt);
-        busWellInfoService.updateById(busWellInfo);
+        busWellInfoService.armingById(wellId,bfzt);
         return ResponseData.success();
     }
 
@@ -243,11 +230,9 @@
     @RequestMapping(value = "/batchBfcf", method = RequestMethod.POST)
     @ResponseBody
     public Object batchBfcf(String keywords, String wellType, String deptid, String bfzt) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Long> deptIds = dataScope.getDeptIds();
         busWellInfoService.updateBatchBfcf(keywords, wellType, deptid, bfzt, deptIds);
-
         return ResponseData.success();
     }
 

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
index e40e025..5c52839 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -1,4 +1,4 @@
-package com.casic.missiles.modular.system.enmus;
+package com.casic.missiles.modular.system.enums;
 
 
 import java.util.HashMap;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index e198987..bb21265 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -132,7 +132,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
index 0b19af8..5b2bbff 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
@@ -164,7 +164,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     private String valid;
     /**
      * 布防状态
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index 397d202..479eeb3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -30,6 +30,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+
 @ColumnWidth(30)
 @HeadRowHeight(15)
 @ContentRowHeight(20)
@@ -54,6 +55,7 @@
     /**
      * 设备名称
      */
+    @ExcelProperty("设备名称")
     @TableField("DEVICE_NAME")
     private String deviceName;
     /**
@@ -64,6 +66,7 @@
     /**
      * 设备类型
      */
+
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
@@ -109,9 +112,13 @@
     //集中器ID
     @TableField(exist = false)
     private Long concenId;
+
     @TableField(exist = false)
     private String installDateFmt;
 
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
     @Override
     public String toString() {
         return "Device{" +
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
index 1419662..f7e5a1e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
@@ -41,7 +41,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("ACTIVE")
     private Integer active;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
index 6c4398f..22c3166 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
@@ -42,7 +42,6 @@
     /**
      * 是否有效：1有效，0无效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 2d65755..f8d2cfd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -170,21 +170,17 @@
         if (null == busWellInfo.getId()) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-
         BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId());
         LogObjectHolder.me().set(oldBusWellInfo);
 
         Utility.convertCoordinate(busWellInfo);
-
         if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){
             busWellInfo.setResponsibleDept(busWellInfo.getDeptid());
         }
-
 //        List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
 //        if(ToolUtil.isNotEmpty(deptTopRoleUsers)){
 //            busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString());
 //        }
-
         busWellInfoService.updateById(busWellInfo);
         return ResponseData.success();
     }
@@ -215,11 +211,6 @@
         return resultData;
     }
 
-
-
-
-
-
     /**
      * 闸井布防撤防接口
      */
@@ -229,11 +220,7 @@
         if (null ==wellId || StrUtil.isEmpty(bfzt)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-
-        BusWellInfo busWellInfo = new BusWellInfo();
-        busWellInfo.setId(wellId);
-        busWellInfo.setBfzt(bfzt);
-        busWellInfoService.updateById(busWellInfo);
+        busWellInfoService.armingById(wellId,bfzt);
         return ResponseData.success();
     }
 
@@ -243,11 +230,9 @@
     @RequestMapping(value = "/batchBfcf", method = RequestMethod.POST)
     @ResponseBody
     public Object batchBfcf(String keywords, String wellType, String deptid, String bfzt) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Long> deptIds = dataScope.getDeptIds();
         busWellInfoService.updateBatchBfcf(keywords, wellType, deptid, bfzt, deptIds);
-
         return ResponseData.success();
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index f649b2c..7d606a9 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -51,6 +51,8 @@
 
     List<BusWellInfo> getWellListAll();
 
+    Integer armingById(@Param("id")Long id,@Param("bfzt")String bfzt);
+
 
 
 

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
index e40e025..5c52839 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -1,4 +1,4 @@
-package com.casic.missiles.modular.system.enmus;
+package com.casic.missiles.modular.system.enums;
 
 
 import java.util.HashMap;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index e198987..bb21265 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -132,7 +132,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
index 0b19af8..5b2bbff 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
@@ -164,7 +164,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     private String valid;
     /**
      * 布防状态
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index 397d202..479eeb3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -30,6 +30,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+
 @ColumnWidth(30)
 @HeadRowHeight(15)
 @ContentRowHeight(20)
@@ -54,6 +55,7 @@
     /**
      * 设备名称
      */
+    @ExcelProperty("设备名称")
     @TableField("DEVICE_NAME")
     private String deviceName;
     /**
@@ -64,6 +66,7 @@
     /**
      * 设备类型
      */
+
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
@@ -109,9 +112,13 @@
     //集中器ID
     @TableField(exist = false)
     private Long concenId;
+
     @TableField(exist = false)
     private String installDateFmt;
 
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
     @Override
     public String toString() {
         return "Device{" +
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
index 1419662..f7e5a1e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
@@ -41,7 +41,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("ACTIVE")
     private Integer active;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
index 6c4398f..22c3166 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
@@ -42,7 +42,6 @@
     /**
      * 是否有效：1有效，0无效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 2d65755..f8d2cfd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -170,21 +170,17 @@
         if (null == busWellInfo.getId()) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-
         BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId());
         LogObjectHolder.me().set(oldBusWellInfo);
 
         Utility.convertCoordinate(busWellInfo);
-
         if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){
             busWellInfo.setResponsibleDept(busWellInfo.getDeptid());
         }
-
 //        List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
 //        if(ToolUtil.isNotEmpty(deptTopRoleUsers)){
 //            busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString());
 //        }
-
         busWellInfoService.updateById(busWellInfo);
         return ResponseData.success();
     }
@@ -215,11 +211,6 @@
         return resultData;
     }
 
-
-
-
-
-
     /**
      * 闸井布防撤防接口
      */
@@ -229,11 +220,7 @@
         if (null ==wellId || StrUtil.isEmpty(bfzt)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-
-        BusWellInfo busWellInfo = new BusWellInfo();
-        busWellInfo.setId(wellId);
-        busWellInfo.setBfzt(bfzt);
-        busWellInfoService.updateById(busWellInfo);
+        busWellInfoService.armingById(wellId,bfzt);
         return ResponseData.success();
     }
 
@@ -243,11 +230,9 @@
     @RequestMapping(value = "/batchBfcf", method = RequestMethod.POST)
     @ResponseBody
     public Object batchBfcf(String keywords, String wellType, String deptid, String bfzt) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Long> deptIds = dataScope.getDeptIds();
         busWellInfoService.updateBatchBfcf(keywords, wellType, deptid, bfzt, deptIds);
-
         return ResponseData.success();
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index f649b2c..7d606a9 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -51,6 +51,8 @@
 
     List<BusWellInfo> getWellListAll();
 
+    Integer armingById(@Param("id")Long id,@Param("bfzt")String bfzt);
+
 
 
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 219d516..82cc624 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -123,7 +123,6 @@
     </select>
 
 
-
     <select id="selectDataScope" resultType="com.casic.missiles.modular.system.dto.BatchExportDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId,
@@ -218,6 +217,12 @@
         AND w.VALID='1'
     </select>
 
+    <update id="armingById">
+        UPDATE  bus_well_info
+        SET bfzt = #{bfzt}
+        WHERE VALID = '1'
+        AND ID=#{id}
+    </update>
 
     <update id="updateBatchBfcf">
         UPDATE
@@ -260,6 +265,4 @@
     </select>
 
 
-
-
 </mapper>

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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
index e40e025..5c52839 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -1,4 +1,4 @@
-package com.casic.missiles.modular.system.enmus;
+package com.casic.missiles.modular.system.enums;
 
 
 import java.util.HashMap;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index e198987..bb21265 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -132,7 +132,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
index 0b19af8..5b2bbff 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
@@ -164,7 +164,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     private String valid;
     /**
      * 布防状态
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index 397d202..479eeb3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -30,6 +30,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+
 @ColumnWidth(30)
 @HeadRowHeight(15)
 @ContentRowHeight(20)
@@ -54,6 +55,7 @@
     /**
      * 设备名称
      */
+    @ExcelProperty("设备名称")
     @TableField("DEVICE_NAME")
     private String deviceName;
     /**
@@ -64,6 +66,7 @@
     /**
      * 设备类型
      */
+
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
@@ -109,9 +112,13 @@
     //集中器ID
     @TableField(exist = false)
     private Long concenId;
+
     @TableField(exist = false)
     private String installDateFmt;
 
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
     @Override
     public String toString() {
         return "Device{" +
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
index 1419662..f7e5a1e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
@@ -41,7 +41,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("ACTIVE")
     private Integer active;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
index 6c4398f..22c3166 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
@@ -42,7 +42,6 @@
     /**
      * 是否有效：1有效，0无效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 2d65755..f8d2cfd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -170,21 +170,17 @@
         if (null == busWellInfo.getId()) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-
         BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId());
         LogObjectHolder.me().set(oldBusWellInfo);
 
         Utility.convertCoordinate(busWellInfo);
-
         if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){
             busWellInfo.setResponsibleDept(busWellInfo.getDeptid());
         }
-
 //        List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
 //        if(ToolUtil.isNotEmpty(deptTopRoleUsers)){
 //            busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString());
 //        }
-
         busWellInfoService.updateById(busWellInfo);
         return ResponseData.success();
     }
@@ -215,11 +211,6 @@
         return resultData;
     }
 
-
-
-
-
-
     /**
      * 闸井布防撤防接口
      */
@@ -229,11 +220,7 @@
         if (null ==wellId || StrUtil.isEmpty(bfzt)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-
-        BusWellInfo busWellInfo = new BusWellInfo();
-        busWellInfo.setId(wellId);
-        busWellInfo.setBfzt(bfzt);
-        busWellInfoService.updateById(busWellInfo);
+        busWellInfoService.armingById(wellId,bfzt);
         return ResponseData.success();
     }
 
@@ -243,11 +230,9 @@
     @RequestMapping(value = "/batchBfcf", method = RequestMethod.POST)
     @ResponseBody
     public Object batchBfcf(String keywords, String wellType, String deptid, String bfzt) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Long> deptIds = dataScope.getDeptIds();
         busWellInfoService.updateBatchBfcf(keywords, wellType, deptid, bfzt, deptIds);
-
         return ResponseData.success();
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index f649b2c..7d606a9 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -51,6 +51,8 @@
 
     List<BusWellInfo> getWellListAll();
 
+    Integer armingById(@Param("id")Long id,@Param("bfzt")String bfzt);
+
 
 
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 219d516..82cc624 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -123,7 +123,6 @@
     </select>
 
 
-
     <select id="selectDataScope" resultType="com.casic.missiles.modular.system.dto.BatchExportDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId,
@@ -218,6 +217,12 @@
         AND w.VALID='1'
     </select>
 
+    <update id="armingById">
+        UPDATE  bus_well_info
+        SET bfzt = #{bfzt}
+        WHERE VALID = '1'
+        AND ID=#{id}
+    </update>
 
     <update id="updateBatchBfcf">
         UPDATE
@@ -260,6 +265,4 @@
     </select>
 
 
-
-
 </mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
index c65eb40..b2f730b 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
@@ -44,6 +44,8 @@
 
     String getAreaPid(String id);
 
+    Integer armingById(Long id,String bfzt);
+
     void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List<Long> deptIds);
 
     Boolean isExistWellCode(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 79804bf..0886219 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
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
@@ -10,7 +11,7 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
-import com.casic.missiles.modular.system.dto.DeviceMonitorDataDto;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,10 +43,10 @@
     @GetMapping(value = "/welldata/list")
     @Permission
     public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -53,29 +54,45 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 井盖状态检测仪
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/welldata/export")
     @Permission
     public void batchExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<WellCoverDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellCoverDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+        super.exportExcel(WellCoverDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
     }
 
+    /**
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
     @GetMapping(value = "/liquiddata/list")
     @Permission
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -84,7 +101,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -92,40 +109,53 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    /**
+     * 液体导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
 
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
 
         list.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, list, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list")
     //@Permission
     public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataExcelDtoList);
         return ResponseData.success(super.packForBT(page));
     }
 
     @GetMapping(value = "/tubedata/list")
     //@Permission
     public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -144,16 +174,19 @@
     @GetMapping(value = "/tubedata/export")
     //@Permission
     public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
+        //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        //TODO 导出表头设置
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
-//        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+
+        List<DeviceDataExcelDto> tubeDatalist = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+
+        tubeDatalist.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceDataExcelDto.class, tubeDatalist, DeviceExportEnum.TUBEDATA_EXPORT.getFileName());
     }
 
     /**
@@ -167,16 +200,19 @@
      * @throws IOException
      */
     @GetMapping(value = "/gasdata/export")
+
     public void gasDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> deviceDataList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
     }
 
 
@@ -191,9 +227,9 @@
      */
     @GetMapping(value = "/harmfuldata/list")
     public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -210,15 +246,17 @@
      */
     @GetMapping(value = "/harmfuldata/export")
     public void harmfulDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<HarmfulDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<HarmfulDataDto> harmfulDataDtoList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        harmfulDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+        super.exportExcel(HarmfulDataDto.class, harmfulDataDtoList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
     }
 
     /**
@@ -232,9 +270,9 @@
      */
     @GetMapping(value = "/tempdata/list")
     public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -251,9 +289,9 @@
      */
     @GetMapping(value = "/temppressdata/list")
     public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemppressDataDto> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -271,18 +309,22 @@
      */
     @GetMapping(value = "/temppressdata/export")
     public void temppressDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemppressDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
+        List<TemppressDataDto> temppressDataDtoList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temppressDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(TemppressDataDto.class, temppressDataDtoList, DeviceExportEnum.TEMPPRESSDATA_EXPORT.getFileName());
     }
 
 
+    //TODO 导出表头设置
+
+
     /**
      * 温湿度数据导出
      *
@@ -295,15 +337,17 @@
      */
     @GetMapping(value = "/tempdata/export")
     public void tempDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<TemhumDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<TemhumDataDto> temhumDataDtoList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        temhumDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+        super.exportExcel(TemhumDataDto.class, temhumDataDtoList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
     }
 
     /**
@@ -317,9 +361,9 @@
      */
     @GetMapping(value = "/digdata/list")
     public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -336,15 +380,18 @@
      */
     @GetMapping(value = "/digdata/export")
     public void digDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
     }
 
     /**
@@ -358,9 +405,9 @@
      */
     @GetMapping(value = "/welllocadata/list")
     public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -377,15 +424,18 @@
      */
     @GetMapping(value = "/welllocadata/export")
     public void wellLocDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<WellAppointDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<WellAppointDataDto> wellAppointDataDtoList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        wellAppointDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+        super.exportExcel(WellAppointDataDto.class, wellAppointDataDtoList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
     }
 
     /**
@@ -399,9 +449,9 @@
      */
     @GetMapping(value = "/noisedata/list")
     public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<DigNoiseDataDto> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -418,14 +468,18 @@
      */
     @GetMapping(value = "/noisedata/export")
     public void noiseDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DigNoiseDataDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
 
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
+        List<DigNoiseDataDto> digNoiseDataDtoList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        digNoiseDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DigNoiseDataDto.class, digNoiseDataDtoList, DeviceExportEnum.NOISEDATA_EXPORT.getFileName());
     }
 
 
@@ -441,10 +495,9 @@
     @Permission
     public Object alarmsByDept(Long deviceType, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-
         //根据权属单位查询告警次数及告警设备数
-        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, permissionService.getAuthService().getLoginUser().getDeptId());
-
+        List<AlarmDeptStaticsDto> list = deviceService.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope,
+                permissionService.getAuthService().getLoginUser().getDeptId());
         return ResponseData.success(list);
     }
 
@@ -461,9 +514,9 @@
      */
     @GetMapping(value = "/liquidGasData/list")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<DeviceDataExcelDto> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         page.setRecords(mapList);
         return ResponseData.success(super.packForBT(page));
     }
@@ -481,30 +534,32 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
 
-        for (Map<String, Object> map : mapList) {
-
-            if ("gas".equals(sensorType)) {
-                Double dValue = Double.valueOf(String.valueOf(map.get("data")));
-                if (dValue <= 20.0) {
-                    map.put("data", dValue + "%LEL");
-                } else {
-                    DecimalFormat df = new DecimalFormat("0.00");
-                    dValue = dValue / 20.0;
-                    map.put("data", df.format(dValue) + "%VOL");
-                    map.put("data", df.format(dValue) + "%VOL");
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    if ("gas".equals(sensorType)) {
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        if (dValue <= 20.0) {
+                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                        } else {
+                            DecimalFormat df = new DecimalFormat("0.00");
+                            dValue = dValue / 20.0;
+                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                        }
+                    }
                 }
-            }
-        }
+        );
         //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        deviceDataExcelDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        //TODO 导出表头设置
+        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
     /**
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 328ca97..0accf94 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,19 +56,19 @@
 
     BfztCountDataDto bfztCountData(@Param("deptIds") List<Long> deptIds, @Param("isApp") Boolean isApp);
 
-    List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<HarmfulDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemhumDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<TemppressDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellAppointDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DigNoiseDataDto> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptId")Long deptId, @Param("searchCurr")Boolean searchCurr);
-    List<Map<String, Object>> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
-    List<Map<String, Object>> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String, Object>> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page,@Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
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 bb1a5cb..acf474f 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
@@ -189,12 +189,13 @@
         DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="upTime_toChar" databaseId="oracle">
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectLiquidDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectLiquidDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -252,21 +253,21 @@
         TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="endtime_sql" databaseId="oracle">
         TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="mysql">
         #{endTime}
     </sql>
 
 
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+    <select id="selectGasLiquidDataLiquidScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -536,12 +537,12 @@
         DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="logTime_toChar" databaseId="oracle">
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
+    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellCoverDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
@@ -579,7 +580,8 @@
         ORDER BY LOGTIME DESC
     </select>
 
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectGasDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -620,8 +622,9 @@
     </select>
 
 
-
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTubeDataScopePage"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dg.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
@@ -643,13 +646,16 @@
             <if test="deptid != null and deptid !=''">
                 and bwi.DEPTID = #{deptid}
             </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
+            <choose>
+                <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                    AND dg.UPTIME <![CDATA[ >= ]]> DATE_FORMAT( #{beginTime}, '%Y-%m-%d %H:%i:%S' )
+                    AND dg.UPTIME <![CDATA[ <= ]]> DATE_FORMAT( #{endTime}, '%Y-%m-%d %H:%i:%S' )
+                </when>
+                <otherwise>
+                    <![CDATA[ AND datediff(now(),dg.UPTIME) <= 30 ]]>
+                </otherwise>
+            </choose>
+
             <if test="keywords != null and keywords !=''">
                 and (dg.DEVCODE like
                 <include refid="keywords_sql"/>
@@ -661,7 +667,8 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectHarmfulDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dhg.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -673,7 +680,7 @@
         dhg.CH4 AS CH4,
         dhg.H2S AS H2S,
         dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
+        dhg.SWITCH AS switchStart,
         DATE_FORMAT( dhg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
         DATE_FORMAT( dhg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
         FROM
@@ -704,7 +711,8 @@
         ORDER BY dhg.UPTIME DESC
     </select>
 
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemhumDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -746,8 +754,8 @@
     </select>
 
 
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectTempPressDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dth.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -789,8 +797,8 @@
     </select>
 
 
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dd.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -831,7 +839,8 @@
         ORDER BY dd.UPTIME DESC
     </select>
 
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+    <select id="selectWellLocDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.WellAppointDataDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         dwl.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -872,7 +881,7 @@
         ORDER BY dwl.UPTIME DESC
     </select>
 
-    <select id="selectNoiseDataScopePage" resultType="map">
+    <select id="selectNoiseDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto">
         SELECT
         dn.DEVCODE AS devcode,
         bd.DEVICE_TYPE AS deviceType,
@@ -957,10 +966,10 @@
             <if test="deptId != null">
                 <choose>
                     <when test="searchCurr">
-                        and   SD.ID = #{deptId}
+                        and SD.ID = #{deptId}
                     </when>
                     <otherwise>
-                        AND  SD.PID = #{deptId}
+                        AND SD.PID = #{deptId}
                     </otherwise>
                 </choose>
             </if>
@@ -968,7 +977,7 @@
     </select>
 
 
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+    <select id="selectGasLiquidDataGasScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS deviceType,
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a4923e2..17d3579 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -59,7 +60,7 @@
      * @param keywords  关键字
      * @return
      */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据检索条件查询液位检测数据
      *
@@ -71,40 +72,40 @@
      * @param keywords
      * @return
      */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
-    List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 管盯数据查询
      */
-    List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 有害气体数据查询
      */
-    List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温湿度数据查询
      */
-    List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 温度压力数据查询
      */
-    List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 开挖监测仪数据查询
      */
-    List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 井盖定位监测仪数据查询
      */
-    List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 噪声记录仪数据查询
      */
-    List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 根据权属单位统计设备数及告警次数
      *
@@ -116,7 +117,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 068c750..3b1363c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -13,6 +13,7 @@
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
+import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.enmus.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enmus.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -44,6 +45,7 @@
     private IBusDeviceSupportService deviceSupportService;
     @Resource
     private AbstractPermissionContext permissionService;
+
     @Override
     public List<BusWellInfoDto> getAlarmWellList(DataScope dataScope, String keywords, String wellType, String deptid) {
         return this.baseMapper.getAlarmWellList(dataScope, keywords, wellType, deptid);
@@ -391,87 +393,64 @@
         }
         return watchDataDtos;
     }
+
     //数据相关统计------------------------------------------------------------
     @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
-
+    public List<WellCoverDataDto> selectWellDataScopePage(DataScope dataScope, Page<WellCoverDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
 
     @Override
-    public List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
     }
+
     @Override
-    public List<Map<String, Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        return deviceDataExcelDtoList;
+    }
+
+    @Override
+    public List<DeviceDataExcelDto> selectTubeDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DeviceDataExcelDto> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<HarmfulDataDto> selectHarmfulDataScopePage(DataScope dataScope, Page<HarmfulDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<HarmfulDataDto> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemhumDataDto> selectTempDataScopePage(DataScope dataScope, Page<TemhumDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemhumDataDto> mapList = this.baseMapper.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
 
     @Override
-    public List<Map<String, Object>> selectTempPressDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<TemppressDataDto> selectTempPressDataScopePage(DataScope dataScope, Page<TemppressDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<TemppressDataDto> mapList = this.baseMapper.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectDigDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectWellLocDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<WellAppointDataDto> selectWellLocDataScopePage(DataScope dataScope, Page<WellAppointDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<WellAppointDataDto> mapList = this.baseMapper.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
     @Override
-    public List<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords) {
-        List<Map<String, Object>> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-        }
+    public List<DigNoiseDataDto> selectNoiseDataScopePage(DataScope dataScope, Page<DigNoiseDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<DigNoiseDataDto> mapList = this.baseMapper.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         return mapList;
     }
 
@@ -480,32 +459,35 @@
         List<Long> deptIds = permissionService.getDeptService().getIdsByPid(deptId, DeviceConst.DEPT_TYPE_ORG);
         return this.baseMapper.alarmsStaticsByDept(deviceType, beginTime, endTime, dataScope, deptId, CollectionUtil.isEmpty(deptIds));
     }
+
     @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<Map<String, Object>> mapList = new ArrayList<>();
+        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
         if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+            deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Convert.toLong(map.get("deptid"))));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
+        deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
+                    deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
+//                    setCompany(map);
+                    if ("liquid".equals(sensorType)) {
+                        float liquiddata = Float.valueOf(String.valueOf(deviceDataExcelDto.getStrength()));
+                        if (liquiddata <= 0) {
+                            deviceDataExcelDto.setStrength("正常水位");
+                        }
+                    }
                 }
-            }
-        }
-        return mapList;
+        );
+        return deviceDataExcelDtoList;
     }
+
     @Override
     public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
         if (StrUtil.isAllEmpty(beginTime, endTime)) {
@@ -537,6 +519,11 @@
         }
         return list;
     }
+
+    /**
+     * 查询公司名称、ID
+     * @param dataMap
+     */
     private void setCompany(Map<String, Object> dataMap) {
         if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
             List<Long> parentDepts = permissionService.getDeptService().getParentListById(Convert.toLong(dataMap.get("deptid")));
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 9c9c1dd..438f41d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
@@ -24,13 +25,15 @@
 import com.casic.missiles.modular.system.dto.DeviceCodeSelectDto;
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.dto.DeviceSelectDto;
-import com.casic.missiles.modular.system.enmus.DeviceExportHeadersEnum;
+import com.casic.missiles.modular.system.enums.DeviceExportHeadersEnum;
 import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.model.DeviceAddParam;
 import com.casic.missiles.modular.system.model.DeviceModels;
 import com.casic.missiles.modular.system.model.DeviceType;
 import com.casic.missiles.modular.system.service.IDeviceModelsService;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +47,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY;
 import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_QUERY_DEVICE_TYPE;
@@ -58,6 +60,7 @@
  * @author dev
  * @Date 2019-05-23 18:07:55
  */
+@Slf4j
 @Controller
 @RequestMapping("/device")
 public class DeviceController extends ExportController {
@@ -199,13 +202,13 @@
     @Permission
     @BussinessLog(value = "添加设备", key = DEVICE_ADD_LOG_KEY, dict = DeviceDict.class)
     @ResponseBody
-    public Object add(@Valid Device device, BindingResult result) {
+    public Object add(@Valid Device device , BindingResult result) {
         if (result.hasErrors()) {
             return ResponseData.error(result.getFieldErrors().get(0).getDefaultMessage());
         }
-
+//        Device device = CreateDevice(deviceAddParam);
         try {
-            deviceService.save(device);
+               deviceService.save(device);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             String errorMsg = "设备添加失败";
@@ -219,7 +222,6 @@
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
-
         return ResponseData.success();
     }
 
@@ -265,6 +267,4 @@
         deviceService.updateById(device);
         return ResponseData.success();
     }
-
-
 }
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 d5eb485..ca4e201 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
@@ -28,7 +28,7 @@
             (INSTALLDATE,'yyyy-MM-dd')
     </sql>
     <sql id="installdate_toChar" databaseId="pgsql">
-        to_char (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
+        to_timestamp (INSTALLDATE,'%Y-%m-%d %H:%i:%s')
     </sql>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -108,7 +108,7 @@
         to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="logTime_toChar" databaseId="pgsql">
-        to_char(LOGTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(LOGTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="upTime_toChar" databaseId="mysql">
@@ -119,7 +119,7 @@
         to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss')
     </sql>
     <sql id="upTime_toChar" databaseId="pgsql">
-        to_char(UPTIME,'%Y-%m-%d %H:%i:%s')
+        to_timestamp(UPTIME,'%Y-%m-%d %H:%i:%s')
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
@@ -145,10 +145,10 @@
         #{beginTime}
     </sql>
     <sql id="begintime_sql" databaseId="pgsql">
-        to_char(#{beginTime},'%Y-%m-%d %H:%i:%s')
+        to_timestamp(#{beginTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <sql id="endtime_sql" databaseId="pgsql">
-        to_char(#{endTime},'%Y-%m-%d %H:%i:%s')
+         to_timestamp(#{endTime},'%Y-%m-%d %H:%i:%s')
     </sql>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
new file mode 100644
index 0000000..4064d07
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/model/DeviceAddParam.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.modular.system.model;
+
+import lombok.Data;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ */
+@Data
+public class DeviceAddParam {
+    private String deviceName;
+    private String devcode;
+    private String deviceType;
+    private String wellCode;
+    private String modelId;
+    private String installDate;
+    private String concenCode;
+    private String installHe;
+}
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 3712c31..0a17a5d 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
@@ -11,6 +11,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DeviceMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -67,18 +68,19 @@
 
     @Override
     public boolean save(Device entity) {
+        ResponseData responseData=new ResponseData();
         //根据井编号查询井信息
         DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode());
         if (wellDto == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("编号不存在");
-            throw gunsException;
+            return false;
         }
         DeviceType deviceType = deviceTypeService.getById(entity.getDeviceType());
         if (deviceType == null) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
             gunsException.setErrorMessage("设备类型不存在");
-            throw gunsException;
+            return false;
         }
 
         boolean isAddConcentrator = DeviceConst.YES.equals(deviceType.getIsNoConcent()) ? false : isAddConcentrator(entity);
@@ -89,7 +91,7 @@
             if (null == concentratorDto) {
                 ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
                 gunsException.setErrorMessage("集中器编号不存在");
-                throw gunsException;
+                return false;
             }
         }
         //设置默认值
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
deleted file mode 100644
index e9a5be9..0000000
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceMonitorDataDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.casic.missiles.modular.system.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 设备监控数据
- */
-@Data
-@NoArgsConstructor
-public class DeviceMonitorDataDto {
-
-    /**
-     * WELLCOVER_MONITORVIEW
-     * devcode : 设备编码
-     * deviceType : 设备类型
-     * deviceTypeName : 设备类型名称
-     * deptid : 用户id
-     * deptName : 用户名称
-     * wellCode : 井盖编号
-     * descn : 状态描述
-     * logtime : 日志时间
-     * status : 状态
-     * liquiddata: 液位值
-     * cell: 电量
-     */
-    private String devcode;
-    private Long deviceType;
-    private String deviceTypeName;
-    private Long deptid;
-    private String deptName;
-    private String wellCode;
-    private String descn;
-    private String logtime;
-    private String status;
-    private String liquiddata;
-    private String cell;
-    private String uptime;
-}
-
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
new file mode 100644
index 0000000..804ac83
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@Data
+@NoArgsConstructor
+public class DeviceDataExcelDto {
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("状态")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String strength;
+    @ExcelProperty("日志时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
new file mode 100644
index 0000000..0aa4846
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.casic.missiles.core.base.model.DataFieldDefine;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class DigNoiseDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+
+    private String descn;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("噪声值")
+    private String ddata;
+    @ExcelProperty("频率")
+    private String frequency;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
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
new file mode 100644
index 0000000..84ae05d
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 有害气体
+ */
+@Data
+@NoArgsConstructor
+public class HarmfulDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("甲烷/CH4(%VOL)")
+    private String CH4;
+    @ExcelProperty("氧气(ppm)")
+    private String O2;
+    @ExcelProperty("一氧化氮(ppm)")
+    private String CO;
+    @ExcelProperty("硫化氢(ppm)")
+    private String H2S;
+    @ExcelProperty("液位开关")
+    private String switchStart;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
new file mode 100644
index 0000000..0ce5716
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温湿度Excel导出标题
+ */
+@Data
+@NoArgsConstructor
+public class TemhumDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("湿度")
+    private String humidity;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
new file mode 100644
index 0000000..e86142c
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java
@@ -0,0 +1,41 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 温度压力数据导出
+ */
+@Data
+@NoArgsConstructor
+public class TemppressDataDto {
+
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("温度")
+    private String temperature;
+    @ExcelProperty("压力")
+    private String press;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
new file mode 100644
index 0000000..4b9f355
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author cz
+ * @date 2022-6-22
+ * 井指定位置数据
+ */
+@Data
+@NoArgsConstructor
+public class WellAppointDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门编号")
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("纬度")
+    private String lat;
+    @ExcelProperty("经度")
+    private String lng;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
new file mode 100644
index 0000000..06d5578
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java
@@ -0,0 +1,49 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  * @author cz
+ *  * @date 2022-6-22
+ * 设备监控数据
+ */
+@Data
+@NoArgsConstructor
+public class WellCoverDataDto {
+
+    /**
+     * WELLCOVER_MONITORVIEW
+     * devcode : 设备编码
+     * deviceType : 设备类型
+     * deviceTypeName : 设备类型名称
+     * deptid : 用户id
+     * deptName : 用户名称
+     * wellCode : 井盖编号
+     * descn : 状态描述
+     * logtime : 日志时间
+     * status : 状态
+     * liquiddata: 液位值
+     * cell: 电量
+     */
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    @ExcelProperty("部门Id")
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("井盖编号")
+    private String wellCode;
+    @ExcelProperty("状态描述")
+    private String descn;
+    @ExcelProperty("日志时间")
+    private String logtime;
+    @ExcelProperty("状态")
+    private String status;
+}
+
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
index e40e025..5c52839 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -1,4 +1,4 @@
-package com.casic.missiles.modular.system.enmus;
+package com.casic.missiles.modular.system.enums;
 
 
 import java.util.HashMap;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
index e198987..bb21265 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusConcentrator.java
@@ -132,7 +132,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
index 0b19af8..5b2bbff 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusWellInfo.java
@@ -164,7 +164,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     private String valid;
     /**
      * 布防状态
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index 397d202..479eeb3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -30,6 +30,7 @@
  * @author lwh123
  * @since 2019-05-23
  */
+
 @ColumnWidth(30)
 @HeadRowHeight(15)
 @ContentRowHeight(20)
@@ -54,6 +55,7 @@
     /**
      * 设备名称
      */
+    @ExcelProperty("设备名称")
     @TableField("DEVICE_NAME")
     private String deviceName;
     /**
@@ -64,6 +66,7 @@
     /**
      * 设备类型
      */
+
     @TableField("DEVICE_TYPE")
     private Long deviceType;
 
@@ -109,9 +112,13 @@
     //集中器ID
     @TableField(exist = false)
     private Long concenId;
+
     @TableField(exist = false)
     private String installDateFmt;
 
+    @TableField("INSTALL_HEIGHT")
+    private Double installHeight;
+
     @Override
     public String toString() {
         return "Device{" +
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
index 1419662..f7e5a1e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceConcentrator.java
@@ -41,7 +41,6 @@
     /**
      * 是否有效
      */
-    @TableLogic
     @TableField("ACTIVE")
     private Integer active;
     /**
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
index 6c4398f..22c3166 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceWell.java
@@ -42,7 +42,6 @@
     /**
      * 是否有效：1有效，0无效
      */
-    @TableLogic
     @TableField("VALID")
     private String valid;
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 2d65755..f8d2cfd 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -170,21 +170,17 @@
         if (null == busWellInfo.getId()) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-
         BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId());
         LogObjectHolder.me().set(oldBusWellInfo);
 
         Utility.convertCoordinate(busWellInfo);
-
         if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){
             busWellInfo.setResponsibleDept(busWellInfo.getDeptid());
         }
-
 //        List<User> deptTopRoleUsers = permissionService.getRoleUsersByTips(busWellInfo.getResponsibleDept(),"leader",true);
 //        if(ToolUtil.isNotEmpty(deptTopRoleUsers)){
 //            busWellInfo.setStaff(deptTopRoleUsers.get(0).getId().toString());
 //        }
-
         busWellInfoService.updateById(busWellInfo);
         return ResponseData.success();
     }
@@ -215,11 +211,6 @@
         return resultData;
     }
 
-
-
-
-
-
     /**
      * 闸井布防撤防接口
      */
@@ -229,11 +220,7 @@
         if (null ==wellId || StrUtil.isEmpty(bfzt)) {
             throw new ServiceException(CoreExceptionEnum.REQUEST_NULL);
         }
-
-        BusWellInfo busWellInfo = new BusWellInfo();
-        busWellInfo.setId(wellId);
-        busWellInfo.setBfzt(bfzt);
-        busWellInfoService.updateById(busWellInfo);
+        busWellInfoService.armingById(wellId,bfzt);
         return ResponseData.success();
     }
 
@@ -243,11 +230,9 @@
     @RequestMapping(value = "/batchBfcf", method = RequestMethod.POST)
     @ResponseBody
     public Object batchBfcf(String keywords, String wellType, String deptid, String bfzt) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Long> deptIds = dataScope.getDeptIds();
         busWellInfoService.updateBatchBfcf(keywords, wellType, deptid, bfzt, deptIds);
-
         return ResponseData.success();
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index f649b2c..7d606a9 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -51,6 +51,8 @@
 
     List<BusWellInfo> getWellListAll();
 
+    Integer armingById(@Param("id")Long id,@Param("bfzt")String bfzt);
+
 
 
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 219d516..82cc624 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -123,7 +123,6 @@
     </select>
 
 
-
     <select id="selectDataScope" resultType="com.casic.missiles.modular.system.dto.BatchExportDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT w.WELL_CODE AS wellCode, w.WELL_NAME AS wellName, w.deep, w.WELL_TYPE AS wellType,w.deptid AS deptId,
@@ -218,6 +217,12 @@
         AND w.VALID='1'
     </select>
 
+    <update id="armingById">
+        UPDATE  bus_well_info
+        SET bfzt = #{bfzt}
+        WHERE VALID = '1'
+        AND ID=#{id}
+    </update>
 
     <update id="updateBatchBfcf">
         UPDATE
@@ -260,6 +265,4 @@
     </select>
 
 
-
-
 </mapper>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
index c65eb40..b2f730b 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoService.java
@@ -44,6 +44,8 @@
 
     String getAreaPid(String id);
 
+    Integer armingById(Long id,String bfzt);
+
     void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List<Long> deptIds);
 
     Boolean isExistWellCode(String wellCode);
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 3d37ce7..f02e93c 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -82,6 +82,10 @@
         return list;
     }
 
+    @Override
+    public Integer armingById(Long id,String bfzt) {
+        return  this.baseMapper.armingById(id,bfzt);
+    }
 
     @Override
     public List<BatchExportDataDto> selectDataScope(DataScope dataScope, Page<BatchExportDataDto> page, String deviceType, String deptid, String keywords) {