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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }

diff --git a/casic-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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param 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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
deleted file mode 100644
index f20e952..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-import com.casic.missiles.config.DeviceServerProperties;
-
-import com.casic.missiles.core.util.SpringContextHolder;
-
-public enum DeviceExportEnum  {
-
-    /**
-     *
-     */
-    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
-    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
-    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
-    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
-    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
-    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
-    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
-    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
-    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
-    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
-    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
-    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
-    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
-
-    /**
-     * 导出模板相对路径
-     */
-    private String fileTempPath;
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-
-    DeviceExportEnum(String fileTempPath, String fileName, String description) {
-        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
deleted file mode 100644
index f20e952..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-import com.casic.missiles.config.DeviceServerProperties;
-
-import com.casic.missiles.core.util.SpringContextHolder;
-
-public enum DeviceExportEnum  {
-
-    /**
-     *
-     */
-    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
-    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
-    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
-    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
-    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
-    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
-    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
-    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
-    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
-    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
-    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
-    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
-    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
-
-    /**
-     * 导出模板相对路径
-     */
-    private String fileTempPath;
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-
-    DeviceExportEnum(String fileTempPath, String fileName, String description) {
-        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
deleted file mode 100644
index 5c52839..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备导出标题枚举
- *
- * @author lwh
- */
-public enum DeviceExportHeadersEnum {
-    /**
-     * 设备导出
-     */
-    DEVICE_EXPORT(new HashMap<String, Short>() {
-        {
-            put("设备编号", (short) 6000);
-            put("设备名称", (short) 8000);
-            put("监控内容", (short) 6000);
-            put("设备位置", (short) 6000);
-            put("权属单位", (short) 8000);
-            put("井编号", (short) 6000);
-            put("集中器编号", (short) 6000);
-            put("安装时间", (short) 5000);
-        }
-    }, "device.xlsx", "井盖设备数据导出"
-    );
-
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-    private Map<String, Short> customColumnStyle;
-
-    DeviceExportHeadersEnum(String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-        this.customColumnStyle = customColumnStyle;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Map<String, Short> getCustomColumnStyle() {
-        return this.customColumnStyle;
-    }
-
-}

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
deleted file mode 100644
index f20e952..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-import com.casic.missiles.config.DeviceServerProperties;
-
-import com.casic.missiles.core.util.SpringContextHolder;
-
-public enum DeviceExportEnum  {
-
-    /**
-     *
-     */
-    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
-    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
-    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
-    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
-    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
-    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
-    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
-    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
-    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
-    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
-    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
-    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
-    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
-
-    /**
-     * 导出模板相对路径
-     */
-    private String fileTempPath;
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-
-    DeviceExportEnum(String fileTempPath, String fileName, String description) {
-        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
deleted file mode 100644
index 5c52839..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备导出标题枚举
- *
- * @author lwh
- */
-public enum DeviceExportHeadersEnum {
-    /**
-     * 设备导出
-     */
-    DEVICE_EXPORT(new HashMap<String, Short>() {
-        {
-            put("设备编号", (short) 6000);
-            put("设备名称", (short) 8000);
-            put("监控内容", (short) 6000);
-            put("设备位置", (short) 6000);
-            put("权属单位", (short) 8000);
-            put("井编号", (short) 6000);
-            put("集中器编号", (short) 6000);
-            put("安装时间", (short) 5000);
-        }
-    }, "device.xlsx", "井盖设备数据导出"
-    );
-
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-    private Map<String, Short> customColumnStyle;
-
-    DeviceExportHeadersEnum(String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-        this.customColumnStyle = customColumnStyle;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Map<String, Short> getCustomColumnStyle() {
-        return this.customColumnStyle;
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 090415c..81e52b1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -47,82 +47,7 @@
 
     List<String> addDeviceBatch(List<Device> results);
 
-    /**
-     * 根据条件检索井盖监测数据列表
-     *
-     * @param dataScope 数据权限
-     * @param page      分页查询
-     * @param deptid    组织ID
-     * @param beginTime 起始时间
-     * @param endTime   结束时间
-     * @param keywords  关键字
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
-    /**
-     * 根据检索条件查询液位检测数据
-     *
-     * @param dataScope 数据权限
-     * @param page      分页参数
-     * @param deptid    组织id
-     * @param beginTime
-     * @param endTime
-     * @param keywords
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
-
-    /**
-     * 根据权属单位统计设备数及告警次数
-     *
-     * @param deviceType 设备类型
-     * @param beginTime  起止时间
-     * @param endTime    结束时间
-     * @param dataScope  数据权限
-     * @return
-     */
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
     void deleteByIds(List<Long> ids);
 
@@ -136,11 +61,4 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus);
 
     void registerGeTui(Long id, String clientid);
-
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
-
-    /**
-     * 燃气数据查询
-     */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 }

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
deleted file mode 100644
index f20e952..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-import com.casic.missiles.config.DeviceServerProperties;
-
-import com.casic.missiles.core.util.SpringContextHolder;
-
-public enum DeviceExportEnum  {
-
-    /**
-     *
-     */
-    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
-    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
-    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
-    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
-    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
-    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
-    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
-    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
-    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
-    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
-    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
-    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
-    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
-
-    /**
-     * 导出模板相对路径
-     */
-    private String fileTempPath;
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-
-    DeviceExportEnum(String fileTempPath, String fileName, String description) {
-        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
deleted file mode 100644
index 5c52839..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备导出标题枚举
- *
- * @author lwh
- */
-public enum DeviceExportHeadersEnum {
-    /**
-     * 设备导出
-     */
-    DEVICE_EXPORT(new HashMap<String, Short>() {
-        {
-            put("设备编号", (short) 6000);
-            put("设备名称", (short) 8000);
-            put("监控内容", (short) 6000);
-            put("设备位置", (short) 6000);
-            put("权属单位", (short) 8000);
-            put("井编号", (short) 6000);
-            put("集中器编号", (short) 6000);
-            put("安装时间", (short) 5000);
-        }
-    }, "device.xlsx", "井盖设备数据导出"
-    );
-
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-    private Map<String, Short> customColumnStyle;
-
-    DeviceExportHeadersEnum(String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-        this.customColumnStyle = customColumnStyle;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Map<String, Short> getCustomColumnStyle() {
-        return this.customColumnStyle;
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 090415c..81e52b1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -47,82 +47,7 @@
 
     List<String> addDeviceBatch(List<Device> results);
 
-    /**
-     * 根据条件检索井盖监测数据列表
-     *
-     * @param dataScope 数据权限
-     * @param page      分页查询
-     * @param deptid    组织ID
-     * @param beginTime 起始时间
-     * @param endTime   结束时间
-     * @param keywords  关键字
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
-    /**
-     * 根据检索条件查询液位检测数据
-     *
-     * @param dataScope 数据权限
-     * @param page      分页参数
-     * @param deptid    组织id
-     * @param beginTime
-     * @param endTime
-     * @param keywords
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
-
-    /**
-     * 根据权属单位统计设备数及告警次数
-     *
-     * @param deviceType 设备类型
-     * @param beginTime  起止时间
-     * @param endTime    结束时间
-     * @param dataScope  数据权限
-     * @return
-     */
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
     void deleteByIds(List<Long> ids);
 
@@ -136,11 +61,4 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus);
 
     void registerGeTui(Long id, String clientid);
-
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
-
-    /**
-     * 燃气数据查询
-     */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 }
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 de9111e..3712c31 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
@@ -1,15 +1,12 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
@@ -26,7 +23,6 @@
 import org.springframework.validation.FieldError;
 import org.springframework.validation.Validator;
 
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -53,8 +49,6 @@
     @Autowired
     private IDeviceWellService deviceWellService;
 
-    @Resource
-    private AbstractPermissionContext permissionService;
 
     @Autowired
     private Validator validator;
@@ -306,95 +300,9 @@
         return list;
     }
 
-    @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
-        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 void deleteByIds(List<Long> ids) {
@@ -444,77 +352,6 @@
         return new DeviceWell(deviceId, wellId, new Date(), "1");
     }
 
-
-    @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<>();
-        if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
-                }
-            }
-        }
-        return mapList;
-    }
-
-    private void setCompany(Map<String, Object> dataMap) {
-        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
-            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
-            if (CollectionUtil.isNotEmpty(parentDepts)) {
-                Long companyId = parentDepts.get(parentDepts.size() - 1);
-                dataMap.put("companyId", companyId);
-                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
-            }
-        }
-    }
-
-    @Override
-    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
-        if (StrUtil.isAllEmpty(beginTime, endTime)) {
-            Calendar calendar = Calendar.getInstance();
-            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-            calendar.add(Calendar.DATE, -7);
-            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-        }
-        List<Map<String, Object>> list = new ArrayList<>();
-        switch (watchType) {
-            case "liquid":
-                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "gas":
-                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "temp":
-                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "harmful":
-                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            default:
-                break;
-        }
-        for (Map<String, Object> map : list) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-        }
-        return list;
-    }
-
     @Override
     public List<DeviceInfoDto> getDeviceList(DataScope dataScope) {
         return this.baseMapper.getDeviceList(dataScope);

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
deleted file mode 100644
index f20e952..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-import com.casic.missiles.config.DeviceServerProperties;
-
-import com.casic.missiles.core.util.SpringContextHolder;
-
-public enum DeviceExportEnum  {
-
-    /**
-     *
-     */
-    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
-    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
-    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
-    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
-    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
-    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
-    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
-    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
-    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
-    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
-    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
-    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
-    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
-
-    /**
-     * 导出模板相对路径
-     */
-    private String fileTempPath;
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-
-    DeviceExportEnum(String fileTempPath, String fileName, String description) {
-        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
deleted file mode 100644
index 5c52839..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备导出标题枚举
- *
- * @author lwh
- */
-public enum DeviceExportHeadersEnum {
-    /**
-     * 设备导出
-     */
-    DEVICE_EXPORT(new HashMap<String, Short>() {
-        {
-            put("设备编号", (short) 6000);
-            put("设备名称", (short) 8000);
-            put("监控内容", (short) 6000);
-            put("设备位置", (short) 6000);
-            put("权属单位", (short) 8000);
-            put("井编号", (short) 6000);
-            put("集中器编号", (short) 6000);
-            put("安装时间", (short) 5000);
-        }
-    }, "device.xlsx", "井盖设备数据导出"
-    );
-
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-    private Map<String, Short> customColumnStyle;
-
-    DeviceExportHeadersEnum(String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-        this.customColumnStyle = customColumnStyle;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Map<String, Short> getCustomColumnStyle() {
-        return this.customColumnStyle;
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 090415c..81e52b1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -47,82 +47,7 @@
 
     List<String> addDeviceBatch(List<Device> results);
 
-    /**
-     * 根据条件检索井盖监测数据列表
-     *
-     * @param dataScope 数据权限
-     * @param page      分页查询
-     * @param deptid    组织ID
-     * @param beginTime 起始时间
-     * @param endTime   结束时间
-     * @param keywords  关键字
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
-    /**
-     * 根据检索条件查询液位检测数据
-     *
-     * @param dataScope 数据权限
-     * @param page      分页参数
-     * @param deptid    组织id
-     * @param beginTime
-     * @param endTime
-     * @param keywords
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
-
-    /**
-     * 根据权属单位统计设备数及告警次数
-     *
-     * @param deviceType 设备类型
-     * @param beginTime  起止时间
-     * @param endTime    结束时间
-     * @param dataScope  数据权限
-     * @return
-     */
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
     void deleteByIds(List<Long> ids);
 
@@ -136,11 +61,4 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus);
 
     void registerGeTui(Long id, String clientid);
-
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
-
-    /**
-     * 燃气数据查询
-     */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 }
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 de9111e..3712c31 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
@@ -1,15 +1,12 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
@@ -26,7 +23,6 @@
 import org.springframework.validation.FieldError;
 import org.springframework.validation.Validator;
 
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -53,8 +49,6 @@
     @Autowired
     private IDeviceWellService deviceWellService;
 
-    @Resource
-    private AbstractPermissionContext permissionService;
 
     @Autowired
     private Validator validator;
@@ -306,95 +300,9 @@
         return list;
     }
 
-    @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
-        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 void deleteByIds(List<Long> ids) {
@@ -444,77 +352,6 @@
         return new DeviceWell(deviceId, wellId, new Date(), "1");
     }
 
-
-    @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<>();
-        if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
-                }
-            }
-        }
-        return mapList;
-    }
-
-    private void setCompany(Map<String, Object> dataMap) {
-        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
-            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
-            if (CollectionUtil.isNotEmpty(parentDepts)) {
-                Long companyId = parentDepts.get(parentDepts.size() - 1);
-                dataMap.put("companyId", companyId);
-                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
-            }
-        }
-    }
-
-    @Override
-    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
-        if (StrUtil.isAllEmpty(beginTime, endTime)) {
-            Calendar calendar = Calendar.getInstance();
-            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-            calendar.add(Calendar.DATE, -7);
-            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-        }
-        List<Map<String, Object>> list = new ArrayList<>();
-        switch (watchType) {
-            case "liquid":
-                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "gas":
-                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "temp":
-                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "harmful":
-                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            default:
-                break;
-        }
-        for (Map<String, Object> map : list) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-        }
-        return list;
-    }
-
     @Override
     public List<DeviceInfoDto> getDeviceList(DataScope dataScope) {
         return this.baseMapper.getDeviceList(dataScope);
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
new file mode 100644
index 0000000..854aaaa
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.system.constant;
+
+public class DeviceConst {
+    /**
+     * 导出模板路径
+     */
+    public static final String EXPORT_TEMP_PATH = "/config/export/";
+
+    /**
+     * 模板下载路径
+     */
+    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
+    public static final String YES = "1";
+    public static final String NO = "0";
+    public static final String DEPT_TYPE_ORG = "03";
+    /**
+     * 设备类型查询
+     */
+    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
+
+    /**
+     * 设备类型添加日志KEY
+     */
+    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
+
+    /**
+     * app版本更新路径
+     */
+    public static final String APP_DOWNLOAD = "apk/";
+}

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
deleted file mode 100644
index f20e952..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-import com.casic.missiles.config.DeviceServerProperties;
-
-import com.casic.missiles.core.util.SpringContextHolder;
-
-public enum DeviceExportEnum  {
-
-    /**
-     *
-     */
-    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
-    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
-    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
-    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
-    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
-    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
-    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
-    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
-    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
-    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
-    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
-    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
-    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
-
-    /**
-     * 导出模板相对路径
-     */
-    private String fileTempPath;
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-
-    DeviceExportEnum(String fileTempPath, String fileName, String description) {
-        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
deleted file mode 100644
index 5c52839..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备导出标题枚举
- *
- * @author lwh
- */
-public enum DeviceExportHeadersEnum {
-    /**
-     * 设备导出
-     */
-    DEVICE_EXPORT(new HashMap<String, Short>() {
-        {
-            put("设备编号", (short) 6000);
-            put("设备名称", (short) 8000);
-            put("监控内容", (short) 6000);
-            put("设备位置", (short) 6000);
-            put("权属单位", (short) 8000);
-            put("井编号", (short) 6000);
-            put("集中器编号", (short) 6000);
-            put("安装时间", (short) 5000);
-        }
-    }, "device.xlsx", "井盖设备数据导出"
-    );
-
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-    private Map<String, Short> customColumnStyle;
-
-    DeviceExportHeadersEnum(String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-        this.customColumnStyle = customColumnStyle;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Map<String, Short> getCustomColumnStyle() {
-        return this.customColumnStyle;
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 090415c..81e52b1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -47,82 +47,7 @@
 
     List<String> addDeviceBatch(List<Device> results);
 
-    /**
-     * 根据条件检索井盖监测数据列表
-     *
-     * @param dataScope 数据权限
-     * @param page      分页查询
-     * @param deptid    组织ID
-     * @param beginTime 起始时间
-     * @param endTime   结束时间
-     * @param keywords  关键字
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
-    /**
-     * 根据检索条件查询液位检测数据
-     *
-     * @param dataScope 数据权限
-     * @param page      分页参数
-     * @param deptid    组织id
-     * @param beginTime
-     * @param endTime
-     * @param keywords
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
-
-    /**
-     * 根据权属单位统计设备数及告警次数
-     *
-     * @param deviceType 设备类型
-     * @param beginTime  起止时间
-     * @param endTime    结束时间
-     * @param dataScope  数据权限
-     * @return
-     */
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
     void deleteByIds(List<Long> ids);
 
@@ -136,11 +61,4 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus);
 
     void registerGeTui(Long id, String clientid);
-
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
-
-    /**
-     * 燃气数据查询
-     */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 }
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 de9111e..3712c31 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
@@ -1,15 +1,12 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
@@ -26,7 +23,6 @@
 import org.springframework.validation.FieldError;
 import org.springframework.validation.Validator;
 
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -53,8 +49,6 @@
     @Autowired
     private IDeviceWellService deviceWellService;
 
-    @Resource
-    private AbstractPermissionContext permissionService;
 
     @Autowired
     private Validator validator;
@@ -306,95 +300,9 @@
         return list;
     }
 
-    @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
-        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 void deleteByIds(List<Long> ids) {
@@ -444,77 +352,6 @@
         return new DeviceWell(deviceId, wellId, new Date(), "1");
     }
 
-
-    @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<>();
-        if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
-                }
-            }
-        }
-        return mapList;
-    }
-
-    private void setCompany(Map<String, Object> dataMap) {
-        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
-            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
-            if (CollectionUtil.isNotEmpty(parentDepts)) {
-                Long companyId = parentDepts.get(parentDepts.size() - 1);
-                dataMap.put("companyId", companyId);
-                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
-            }
-        }
-    }
-
-    @Override
-    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
-        if (StrUtil.isAllEmpty(beginTime, endTime)) {
-            Calendar calendar = Calendar.getInstance();
-            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-            calendar.add(Calendar.DATE, -7);
-            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-        }
-        List<Map<String, Object>> list = new ArrayList<>();
-        switch (watchType) {
-            case "liquid":
-                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "gas":
-                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "temp":
-                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "harmful":
-                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            default:
-                break;
-        }
-        for (Map<String, Object> map : list) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-        }
-        return list;
-    }
-
     @Override
     public List<DeviceInfoDto> getDeviceList(DataScope dataScope) {
         return this.baseMapper.getDeviceList(dataScope);
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
new file mode 100644
index 0000000..854aaaa
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.system.constant;
+
+public class DeviceConst {
+    /**
+     * 导出模板路径
+     */
+    public static final String EXPORT_TEMP_PATH = "/config/export/";
+
+    /**
+     * 模板下载路径
+     */
+    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
+    public static final String YES = "1";
+    public static final String NO = "0";
+    public static final String DEPT_TYPE_ORG = "03";
+    /**
+     * 设备类型查询
+     */
+    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
+
+    /**
+     * 设备类型添加日志KEY
+     */
+    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
+
+    /**
+     * app版本更新路径
+     */
+    public static final String APP_DOWNLOAD = "apk/";
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
new file mode 100644
index 0000000..aa09c1f
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.system.enmus;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+
+public enum DeviceExportEnum  {
+
+    /**
+     *
+     */
+    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
+    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
+    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
+    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
+    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
+    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
+    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
+    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
+    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
+    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
+    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
+    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
+
+    /**
+     * 导出模板相对路径
+     */
+    private String fileTempPath;
+    /**
+     * 下载文件名
+     */
+    private String fileName;
+    /**
+     * 描述信息
+     */
+    private String description;
+
+    DeviceExportEnum(String fileTempPath, String fileName, String description) {
+//        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
+        this.fileName = fileName;
+        this.description = description;
+    }
+
+
+    public String getFileTempPath() {
+        return fileTempPath;
+    }
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+
+    public String getDescription() {
+        return description;
+    }
+}

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
deleted file mode 100644
index f20e952..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-import com.casic.missiles.config.DeviceServerProperties;
-
-import com.casic.missiles.core.util.SpringContextHolder;
-
-public enum DeviceExportEnum  {
-
-    /**
-     *
-     */
-    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
-    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
-    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
-    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
-    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
-    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
-    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
-    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
-    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
-    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
-    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
-    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
-    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
-
-    /**
-     * 导出模板相对路径
-     */
-    private String fileTempPath;
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-
-    DeviceExportEnum(String fileTempPath, String fileName, String description) {
-        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
deleted file mode 100644
index 5c52839..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备导出标题枚举
- *
- * @author lwh
- */
-public enum DeviceExportHeadersEnum {
-    /**
-     * 设备导出
-     */
-    DEVICE_EXPORT(new HashMap<String, Short>() {
-        {
-            put("设备编号", (short) 6000);
-            put("设备名称", (short) 8000);
-            put("监控内容", (short) 6000);
-            put("设备位置", (short) 6000);
-            put("权属单位", (short) 8000);
-            put("井编号", (short) 6000);
-            put("集中器编号", (short) 6000);
-            put("安装时间", (short) 5000);
-        }
-    }, "device.xlsx", "井盖设备数据导出"
-    );
-
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-    private Map<String, Short> customColumnStyle;
-
-    DeviceExportHeadersEnum(String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-        this.customColumnStyle = customColumnStyle;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Map<String, Short> getCustomColumnStyle() {
-        return this.customColumnStyle;
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 090415c..81e52b1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -47,82 +47,7 @@
 
     List<String> addDeviceBatch(List<Device> results);
 
-    /**
-     * 根据条件检索井盖监测数据列表
-     *
-     * @param dataScope 数据权限
-     * @param page      分页查询
-     * @param deptid    组织ID
-     * @param beginTime 起始时间
-     * @param endTime   结束时间
-     * @param keywords  关键字
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
-    /**
-     * 根据检索条件查询液位检测数据
-     *
-     * @param dataScope 数据权限
-     * @param page      分页参数
-     * @param deptid    组织id
-     * @param beginTime
-     * @param endTime
-     * @param keywords
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
-
-    /**
-     * 根据权属单位统计设备数及告警次数
-     *
-     * @param deviceType 设备类型
-     * @param beginTime  起止时间
-     * @param endTime    结束时间
-     * @param dataScope  数据权限
-     * @return
-     */
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
     void deleteByIds(List<Long> ids);
 
@@ -136,11 +61,4 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus);
 
     void registerGeTui(Long id, String clientid);
-
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
-
-    /**
-     * 燃气数据查询
-     */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 }
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 de9111e..3712c31 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
@@ -1,15 +1,12 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
@@ -26,7 +23,6 @@
 import org.springframework.validation.FieldError;
 import org.springframework.validation.Validator;
 
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -53,8 +49,6 @@
     @Autowired
     private IDeviceWellService deviceWellService;
 
-    @Resource
-    private AbstractPermissionContext permissionService;
 
     @Autowired
     private Validator validator;
@@ -306,95 +300,9 @@
         return list;
     }
 
-    @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
-        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 void deleteByIds(List<Long> ids) {
@@ -444,77 +352,6 @@
         return new DeviceWell(deviceId, wellId, new Date(), "1");
     }
 
-
-    @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<>();
-        if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
-                }
-            }
-        }
-        return mapList;
-    }
-
-    private void setCompany(Map<String, Object> dataMap) {
-        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
-            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
-            if (CollectionUtil.isNotEmpty(parentDepts)) {
-                Long companyId = parentDepts.get(parentDepts.size() - 1);
-                dataMap.put("companyId", companyId);
-                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
-            }
-        }
-    }
-
-    @Override
-    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
-        if (StrUtil.isAllEmpty(beginTime, endTime)) {
-            Calendar calendar = Calendar.getInstance();
-            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-            calendar.add(Calendar.DATE, -7);
-            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-        }
-        List<Map<String, Object>> list = new ArrayList<>();
-        switch (watchType) {
-            case "liquid":
-                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "gas":
-                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "temp":
-                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "harmful":
-                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            default:
-                break;
-        }
-        for (Map<String, Object> map : list) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-        }
-        return list;
-    }
-
     @Override
     public List<DeviceInfoDto> getDeviceList(DataScope dataScope) {
         return this.baseMapper.getDeviceList(dataScope);
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
new file mode 100644
index 0000000..854aaaa
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.system.constant;
+
+public class DeviceConst {
+    /**
+     * 导出模板路径
+     */
+    public static final String EXPORT_TEMP_PATH = "/config/export/";
+
+    /**
+     * 模板下载路径
+     */
+    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
+    public static final String YES = "1";
+    public static final String NO = "0";
+    public static final String DEPT_TYPE_ORG = "03";
+    /**
+     * 设备类型查询
+     */
+    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
+
+    /**
+     * 设备类型添加日志KEY
+     */
+    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
+
+    /**
+     * app版本更新路径
+     */
+    public static final String APP_DOWNLOAD = "apk/";
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
new file mode 100644
index 0000000..aa09c1f
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.system.enmus;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+
+public enum DeviceExportEnum  {
+
+    /**
+     *
+     */
+    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
+    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
+    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
+    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
+    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
+    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
+    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
+    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
+    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
+    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
+    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
+    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
+
+    /**
+     * 导出模板相对路径
+     */
+    private String fileTempPath;
+    /**
+     * 下载文件名
+     */
+    private String fileName;
+    /**
+     * 描述信息
+     */
+    private String description;
+
+    DeviceExportEnum(String fileTempPath, String fileName, String description) {
+//        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
+        this.fileName = fileName;
+        this.description = description;
+    }
+
+
+    public String getFileTempPath() {
+        return fileTempPath;
+    }
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+
+    public String getDescription() {
+        return description;
+    }
+}
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
new file mode 100644
index 0000000..5c52839
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.enums;
+
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备导出标题枚举
+ *
+ * @author lwh
+ */
+public enum DeviceExportHeadersEnum {
+    /**
+     * 设备导出
+     */
+    DEVICE_EXPORT(new HashMap<String, Short>() {
+        {
+            put("设备编号", (short) 6000);
+            put("设备名称", (short) 8000);
+            put("监控内容", (short) 6000);
+            put("设备位置", (short) 6000);
+            put("权属单位", (short) 8000);
+            put("井编号", (short) 6000);
+            put("集中器编号", (short) 6000);
+            put("安装时间", (short) 5000);
+        }
+    }, "device.xlsx", "井盖设备数据导出"
+    );
+
+    /**
+     * 下载文件名
+     */
+    private String fileName;
+    /**
+     * 描述信息
+     */
+    private String description;
+    private Map<String, Short> customColumnStyle;
+
+    DeviceExportHeadersEnum(String fileName, String description) {
+        this.fileName = fileName;
+        this.description = description;
+    }
+
+    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
+        this.fileName = fileName;
+        this.description = description;
+        this.customColumnStyle = customColumnStyle;
+    }
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Map<String, Short> getCustomColumnStyle() {
+        return this.customColumnStyle;
+    }
+
+}

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
deleted file mode 100644
index f20e952..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-import com.casic.missiles.config.DeviceServerProperties;
-
-import com.casic.missiles.core.util.SpringContextHolder;
-
-public enum DeviceExportEnum  {
-
-    /**
-     *
-     */
-    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
-    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
-    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
-    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
-    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
-    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
-    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
-    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
-    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
-    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
-    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
-    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
-    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
-
-    /**
-     * 导出模板相对路径
-     */
-    private String fileTempPath;
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-
-    DeviceExportEnum(String fileTempPath, String fileName, String description) {
-        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
deleted file mode 100644
index 5c52839..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备导出标题枚举
- *
- * @author lwh
- */
-public enum DeviceExportHeadersEnum {
-    /**
-     * 设备导出
-     */
-    DEVICE_EXPORT(new HashMap<String, Short>() {
-        {
-            put("设备编号", (short) 6000);
-            put("设备名称", (short) 8000);
-            put("监控内容", (short) 6000);
-            put("设备位置", (short) 6000);
-            put("权属单位", (short) 8000);
-            put("井编号", (short) 6000);
-            put("集中器编号", (short) 6000);
-            put("安装时间", (short) 5000);
-        }
-    }, "device.xlsx", "井盖设备数据导出"
-    );
-
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-    private Map<String, Short> customColumnStyle;
-
-    DeviceExportHeadersEnum(String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-        this.customColumnStyle = customColumnStyle;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Map<String, Short> getCustomColumnStyle() {
-        return this.customColumnStyle;
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 090415c..81e52b1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -47,82 +47,7 @@
 
     List<String> addDeviceBatch(List<Device> results);
 
-    /**
-     * 根据条件检索井盖监测数据列表
-     *
-     * @param dataScope 数据权限
-     * @param page      分页查询
-     * @param deptid    组织ID
-     * @param beginTime 起始时间
-     * @param endTime   结束时间
-     * @param keywords  关键字
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
-    /**
-     * 根据检索条件查询液位检测数据
-     *
-     * @param dataScope 数据权限
-     * @param page      分页参数
-     * @param deptid    组织id
-     * @param beginTime
-     * @param endTime
-     * @param keywords
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
-
-    /**
-     * 根据权属单位统计设备数及告警次数
-     *
-     * @param deviceType 设备类型
-     * @param beginTime  起止时间
-     * @param endTime    结束时间
-     * @param dataScope  数据权限
-     * @return
-     */
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
     void deleteByIds(List<Long> ids);
 
@@ -136,11 +61,4 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus);
 
     void registerGeTui(Long id, String clientid);
-
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
-
-    /**
-     * 燃气数据查询
-     */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 }
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 de9111e..3712c31 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
@@ -1,15 +1,12 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
@@ -26,7 +23,6 @@
 import org.springframework.validation.FieldError;
 import org.springframework.validation.Validator;
 
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -53,8 +49,6 @@
     @Autowired
     private IDeviceWellService deviceWellService;
 
-    @Resource
-    private AbstractPermissionContext permissionService;
 
     @Autowired
     private Validator validator;
@@ -306,95 +300,9 @@
         return list;
     }
 
-    @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
-        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 void deleteByIds(List<Long> ids) {
@@ -444,77 +352,6 @@
         return new DeviceWell(deviceId, wellId, new Date(), "1");
     }
 
-
-    @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<>();
-        if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
-                }
-            }
-        }
-        return mapList;
-    }
-
-    private void setCompany(Map<String, Object> dataMap) {
-        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
-            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
-            if (CollectionUtil.isNotEmpty(parentDepts)) {
-                Long companyId = parentDepts.get(parentDepts.size() - 1);
-                dataMap.put("companyId", companyId);
-                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
-            }
-        }
-    }
-
-    @Override
-    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
-        if (StrUtil.isAllEmpty(beginTime, endTime)) {
-            Calendar calendar = Calendar.getInstance();
-            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-            calendar.add(Calendar.DATE, -7);
-            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-        }
-        List<Map<String, Object>> list = new ArrayList<>();
-        switch (watchType) {
-            case "liquid":
-                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "gas":
-                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "temp":
-                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "harmful":
-                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            default:
-                break;
-        }
-        for (Map<String, Object> map : list) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-        }
-        return list;
-    }
-
     @Override
     public List<DeviceInfoDto> getDeviceList(DataScope dataScope) {
         return this.baseMapper.getDeviceList(dataScope);
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
new file mode 100644
index 0000000..854aaaa
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.system.constant;
+
+public class DeviceConst {
+    /**
+     * 导出模板路径
+     */
+    public static final String EXPORT_TEMP_PATH = "/config/export/";
+
+    /**
+     * 模板下载路径
+     */
+    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
+    public static final String YES = "1";
+    public static final String NO = "0";
+    public static final String DEPT_TYPE_ORG = "03";
+    /**
+     * 设备类型查询
+     */
+    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
+
+    /**
+     * 设备类型添加日志KEY
+     */
+    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
+
+    /**
+     * app版本更新路径
+     */
+    public static final String APP_DOWNLOAD = "apk/";
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
new file mode 100644
index 0000000..aa09c1f
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.system.enmus;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+
+public enum DeviceExportEnum  {
+
+    /**
+     *
+     */
+    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
+    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
+    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
+    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
+    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
+    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
+    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
+    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
+    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
+    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
+    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
+    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
+
+    /**
+     * 导出模板相对路径
+     */
+    private String fileTempPath;
+    /**
+     * 下载文件名
+     */
+    private String fileName;
+    /**
+     * 描述信息
+     */
+    private String description;
+
+    DeviceExportEnum(String fileTempPath, String fileName, String description) {
+//        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
+        this.fileName = fileName;
+        this.description = description;
+    }
+
+
+    public String getFileTempPath() {
+        return fileTempPath;
+    }
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+
+    public String getDescription() {
+        return description;
+    }
+}
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
new file mode 100644
index 0000000..5c52839
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.enums;
+
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备导出标题枚举
+ *
+ * @author lwh
+ */
+public enum DeviceExportHeadersEnum {
+    /**
+     * 设备导出
+     */
+    DEVICE_EXPORT(new HashMap<String, Short>() {
+        {
+            put("设备编号", (short) 6000);
+            put("设备名称", (short) 8000);
+            put("监控内容", (short) 6000);
+            put("设备位置", (short) 6000);
+            put("权属单位", (short) 8000);
+            put("井编号", (short) 6000);
+            put("集中器编号", (short) 6000);
+            put("安装时间", (short) 5000);
+        }
+    }, "device.xlsx", "井盖设备数据导出"
+    );
+
+    /**
+     * 下载文件名
+     */
+    private String fileName;
+    /**
+     * 描述信息
+     */
+    private String description;
+    private Map<String, Short> customColumnStyle;
+
+    DeviceExportHeadersEnum(String fileName, String description) {
+        this.fileName = fileName;
+        this.description = description;
+    }
+
+    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
+        this.fileName = fileName;
+        this.description = description;
+        this.customColumnStyle = customColumnStyle;
+    }
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Map<String, Short> getCustomColumnStyle() {
+        return this.customColumnStyle;
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
index e29dad3..5176638 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
@@ -5,7 +5,7 @@
 
 @Data
 @Component
-@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinateConvert")
+@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert")
 public class SluicewellProperties {
     private String coordinate;
 

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
deleted file mode 100644
index f20e952..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-import com.casic.missiles.config.DeviceServerProperties;
-
-import com.casic.missiles.core.util.SpringContextHolder;
-
-public enum DeviceExportEnum  {
-
-    /**
-     *
-     */
-    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
-    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
-    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
-    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
-    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
-    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
-    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
-    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
-    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
-    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
-    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
-    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
-    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
-
-    /**
-     * 导出模板相对路径
-     */
-    private String fileTempPath;
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-
-    DeviceExportEnum(String fileTempPath, String fileName, String description) {
-        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
deleted file mode 100644
index 5c52839..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备导出标题枚举
- *
- * @author lwh
- */
-public enum DeviceExportHeadersEnum {
-    /**
-     * 设备导出
-     */
-    DEVICE_EXPORT(new HashMap<String, Short>() {
-        {
-            put("设备编号", (short) 6000);
-            put("设备名称", (short) 8000);
-            put("监控内容", (short) 6000);
-            put("设备位置", (short) 6000);
-            put("权属单位", (short) 8000);
-            put("井编号", (short) 6000);
-            put("集中器编号", (short) 6000);
-            put("安装时间", (short) 5000);
-        }
-    }, "device.xlsx", "井盖设备数据导出"
-    );
-
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-    private Map<String, Short> customColumnStyle;
-
-    DeviceExportHeadersEnum(String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-        this.customColumnStyle = customColumnStyle;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Map<String, Short> getCustomColumnStyle() {
-        return this.customColumnStyle;
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 090415c..81e52b1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -47,82 +47,7 @@
 
     List<String> addDeviceBatch(List<Device> results);
 
-    /**
-     * 根据条件检索井盖监测数据列表
-     *
-     * @param dataScope 数据权限
-     * @param page      分页查询
-     * @param deptid    组织ID
-     * @param beginTime 起始时间
-     * @param endTime   结束时间
-     * @param keywords  关键字
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
-    /**
-     * 根据检索条件查询液位检测数据
-     *
-     * @param dataScope 数据权限
-     * @param page      分页参数
-     * @param deptid    组织id
-     * @param beginTime
-     * @param endTime
-     * @param keywords
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
-
-    /**
-     * 根据权属单位统计设备数及告警次数
-     *
-     * @param deviceType 设备类型
-     * @param beginTime  起止时间
-     * @param endTime    结束时间
-     * @param dataScope  数据权限
-     * @return
-     */
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
     void deleteByIds(List<Long> ids);
 
@@ -136,11 +61,4 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus);
 
     void registerGeTui(Long id, String clientid);
-
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
-
-    /**
-     * 燃气数据查询
-     */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 }
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 de9111e..3712c31 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
@@ -1,15 +1,12 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
@@ -26,7 +23,6 @@
 import org.springframework.validation.FieldError;
 import org.springframework.validation.Validator;
 
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -53,8 +49,6 @@
     @Autowired
     private IDeviceWellService deviceWellService;
 
-    @Resource
-    private AbstractPermissionContext permissionService;
 
     @Autowired
     private Validator validator;
@@ -306,95 +300,9 @@
         return list;
     }
 
-    @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
-        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 void deleteByIds(List<Long> ids) {
@@ -444,77 +352,6 @@
         return new DeviceWell(deviceId, wellId, new Date(), "1");
     }
 
-
-    @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<>();
-        if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
-                }
-            }
-        }
-        return mapList;
-    }
-
-    private void setCompany(Map<String, Object> dataMap) {
-        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
-            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
-            if (CollectionUtil.isNotEmpty(parentDepts)) {
-                Long companyId = parentDepts.get(parentDepts.size() - 1);
-                dataMap.put("companyId", companyId);
-                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
-            }
-        }
-    }
-
-    @Override
-    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
-        if (StrUtil.isAllEmpty(beginTime, endTime)) {
-            Calendar calendar = Calendar.getInstance();
-            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-            calendar.add(Calendar.DATE, -7);
-            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-        }
-        List<Map<String, Object>> list = new ArrayList<>();
-        switch (watchType) {
-            case "liquid":
-                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "gas":
-                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "temp":
-                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "harmful":
-                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            default:
-                break;
-        }
-        for (Map<String, Object> map : list) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-        }
-        return list;
-    }
-
     @Override
     public List<DeviceInfoDto> getDeviceList(DataScope dataScope) {
         return this.baseMapper.getDeviceList(dataScope);
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
new file mode 100644
index 0000000..854aaaa
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.system.constant;
+
+public class DeviceConst {
+    /**
+     * 导出模板路径
+     */
+    public static final String EXPORT_TEMP_PATH = "/config/export/";
+
+    /**
+     * 模板下载路径
+     */
+    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
+    public static final String YES = "1";
+    public static final String NO = "0";
+    public static final String DEPT_TYPE_ORG = "03";
+    /**
+     * 设备类型查询
+     */
+    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
+
+    /**
+     * 设备类型添加日志KEY
+     */
+    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
+
+    /**
+     * app版本更新路径
+     */
+    public static final String APP_DOWNLOAD = "apk/";
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
new file mode 100644
index 0000000..aa09c1f
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.system.enmus;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+
+public enum DeviceExportEnum  {
+
+    /**
+     *
+     */
+    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
+    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
+    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
+    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
+    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
+    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
+    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
+    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
+    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
+    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
+    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
+    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
+
+    /**
+     * 导出模板相对路径
+     */
+    private String fileTempPath;
+    /**
+     * 下载文件名
+     */
+    private String fileName;
+    /**
+     * 描述信息
+     */
+    private String description;
+
+    DeviceExportEnum(String fileTempPath, String fileName, String description) {
+//        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
+        this.fileName = fileName;
+        this.description = description;
+    }
+
+
+    public String getFileTempPath() {
+        return fileTempPath;
+    }
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+
+    public String getDescription() {
+        return description;
+    }
+}
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
new file mode 100644
index 0000000..5c52839
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.enums;
+
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备导出标题枚举
+ *
+ * @author lwh
+ */
+public enum DeviceExportHeadersEnum {
+    /**
+     * 设备导出
+     */
+    DEVICE_EXPORT(new HashMap<String, Short>() {
+        {
+            put("设备编号", (short) 6000);
+            put("设备名称", (short) 8000);
+            put("监控内容", (short) 6000);
+            put("设备位置", (short) 6000);
+            put("权属单位", (short) 8000);
+            put("井编号", (short) 6000);
+            put("集中器编号", (short) 6000);
+            put("安装时间", (short) 5000);
+        }
+    }, "device.xlsx", "井盖设备数据导出"
+    );
+
+    /**
+     * 下载文件名
+     */
+    private String fileName;
+    /**
+     * 描述信息
+     */
+    private String description;
+    private Map<String, Short> customColumnStyle;
+
+    DeviceExportHeadersEnum(String fileName, String description) {
+        this.fileName = fileName;
+        this.description = description;
+    }
+
+    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
+        this.fileName = fileName;
+        this.description = description;
+        this.customColumnStyle = customColumnStyle;
+    }
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Map<String, Short> getCustomColumnStyle() {
+        return this.customColumnStyle;
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
index e29dad3..5176638 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
@@ -5,7 +5,7 @@
 
 @Data
 @Component
-@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinateConvert")
+@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert")
 public class SluicewellProperties {
     private String coordinate;
 
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 44eccc8..a5dd0a7 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
@@ -253,24 +253,6 @@
         FROM bus_well_info
     </select>
 
-    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
-        SELECT STRENGTH AS data,
-               UPTIME   AS logtime
-        FROM data_gasliquid_gas
-        WHERE DEVCODE = #{devcode}
-        ORDER BY UPTIME
-                DESC LIMIT 1
-    </select>
-
-    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
-        SELECT LIQUIDDATA AS data,
-               UPTIME     AS logtime
-        FROM data_gasliquid_liquid
-        WHERE DEVCODE = #{devcode}
-        ORDER BY UPTIME
-                DESC LIMIT 1
-    </select>
-
 
 
 

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
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
deleted file mode 100644
index f20e952..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-import com.casic.missiles.config.DeviceServerProperties;
-
-import com.casic.missiles.core.util.SpringContextHolder;
-
-public enum DeviceExportEnum  {
-
-    /**
-     *
-     */
-    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
-    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
-    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
-    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
-    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
-    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
-    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
-    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
-    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
-    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
-    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
-    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
-    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
-
-    /**
-     * 导出模板相对路径
-     */
-    private String fileTempPath;
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-
-    DeviceExportEnum(String fileTempPath, String fileName, String description) {
-        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
deleted file mode 100644
index 5c52839..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备导出标题枚举
- *
- * @author lwh
- */
-public enum DeviceExportHeadersEnum {
-    /**
-     * 设备导出
-     */
-    DEVICE_EXPORT(new HashMap<String, Short>() {
-        {
-            put("设备编号", (short) 6000);
-            put("设备名称", (short) 8000);
-            put("监控内容", (short) 6000);
-            put("设备位置", (short) 6000);
-            put("权属单位", (short) 8000);
-            put("井编号", (short) 6000);
-            put("集中器编号", (short) 6000);
-            put("安装时间", (short) 5000);
-        }
-    }, "device.xlsx", "井盖设备数据导出"
-    );
-
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-    private Map<String, Short> customColumnStyle;
-
-    DeviceExportHeadersEnum(String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-        this.customColumnStyle = customColumnStyle;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Map<String, Short> getCustomColumnStyle() {
-        return this.customColumnStyle;
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 090415c..81e52b1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -47,82 +47,7 @@
 
     List<String> addDeviceBatch(List<Device> results);
 
-    /**
-     * 根据条件检索井盖监测数据列表
-     *
-     * @param dataScope 数据权限
-     * @param page      分页查询
-     * @param deptid    组织ID
-     * @param beginTime 起始时间
-     * @param endTime   结束时间
-     * @param keywords  关键字
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
-    /**
-     * 根据检索条件查询液位检测数据
-     *
-     * @param dataScope 数据权限
-     * @param page      分页参数
-     * @param deptid    组织id
-     * @param beginTime
-     * @param endTime
-     * @param keywords
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
-
-    /**
-     * 根据权属单位统计设备数及告警次数
-     *
-     * @param deviceType 设备类型
-     * @param beginTime  起止时间
-     * @param endTime    结束时间
-     * @param dataScope  数据权限
-     * @return
-     */
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
     void deleteByIds(List<Long> ids);
 
@@ -136,11 +61,4 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus);
 
     void registerGeTui(Long id, String clientid);
-
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
-
-    /**
-     * 燃气数据查询
-     */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 }
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 de9111e..3712c31 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
@@ -1,15 +1,12 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
@@ -26,7 +23,6 @@
 import org.springframework.validation.FieldError;
 import org.springframework.validation.Validator;
 
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -53,8 +49,6 @@
     @Autowired
     private IDeviceWellService deviceWellService;
 
-    @Resource
-    private AbstractPermissionContext permissionService;
 
     @Autowired
     private Validator validator;
@@ -306,95 +300,9 @@
         return list;
     }
 
-    @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
-        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 void deleteByIds(List<Long> ids) {
@@ -444,77 +352,6 @@
         return new DeviceWell(deviceId, wellId, new Date(), "1");
     }
 
-
-    @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<>();
-        if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
-                }
-            }
-        }
-        return mapList;
-    }
-
-    private void setCompany(Map<String, Object> dataMap) {
-        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
-            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
-            if (CollectionUtil.isNotEmpty(parentDepts)) {
-                Long companyId = parentDepts.get(parentDepts.size() - 1);
-                dataMap.put("companyId", companyId);
-                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
-            }
-        }
-    }
-
-    @Override
-    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
-        if (StrUtil.isAllEmpty(beginTime, endTime)) {
-            Calendar calendar = Calendar.getInstance();
-            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-            calendar.add(Calendar.DATE, -7);
-            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-        }
-        List<Map<String, Object>> list = new ArrayList<>();
-        switch (watchType) {
-            case "liquid":
-                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "gas":
-                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "temp":
-                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "harmful":
-                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            default:
-                break;
-        }
-        for (Map<String, Object> map : list) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-        }
-        return list;
-    }
-
     @Override
     public List<DeviceInfoDto> getDeviceList(DataScope dataScope) {
         return this.baseMapper.getDeviceList(dataScope);
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
new file mode 100644
index 0000000..854aaaa
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.system.constant;
+
+public class DeviceConst {
+    /**
+     * 导出模板路径
+     */
+    public static final String EXPORT_TEMP_PATH = "/config/export/";
+
+    /**
+     * 模板下载路径
+     */
+    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
+    public static final String YES = "1";
+    public static final String NO = "0";
+    public static final String DEPT_TYPE_ORG = "03";
+    /**
+     * 设备类型查询
+     */
+    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
+
+    /**
+     * 设备类型添加日志KEY
+     */
+    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
+
+    /**
+     * app版本更新路径
+     */
+    public static final String APP_DOWNLOAD = "apk/";
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
new file mode 100644
index 0000000..aa09c1f
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.system.enmus;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+
+public enum DeviceExportEnum  {
+
+    /**
+     *
+     */
+    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
+    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
+    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
+    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
+    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
+    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
+    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
+    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
+    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
+    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
+    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
+    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
+
+    /**
+     * 导出模板相对路径
+     */
+    private String fileTempPath;
+    /**
+     * 下载文件名
+     */
+    private String fileName;
+    /**
+     * 描述信息
+     */
+    private String description;
+
+    DeviceExportEnum(String fileTempPath, String fileName, String description) {
+//        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
+        this.fileName = fileName;
+        this.description = description;
+    }
+
+
+    public String getFileTempPath() {
+        return fileTempPath;
+    }
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+
+    public String getDescription() {
+        return description;
+    }
+}
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
new file mode 100644
index 0000000..5c52839
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.enums;
+
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备导出标题枚举
+ *
+ * @author lwh
+ */
+public enum DeviceExportHeadersEnum {
+    /**
+     * 设备导出
+     */
+    DEVICE_EXPORT(new HashMap<String, Short>() {
+        {
+            put("设备编号", (short) 6000);
+            put("设备名称", (short) 8000);
+            put("监控内容", (short) 6000);
+            put("设备位置", (short) 6000);
+            put("权属单位", (short) 8000);
+            put("井编号", (short) 6000);
+            put("集中器编号", (short) 6000);
+            put("安装时间", (short) 5000);
+        }
+    }, "device.xlsx", "井盖设备数据导出"
+    );
+
+    /**
+     * 下载文件名
+     */
+    private String fileName;
+    /**
+     * 描述信息
+     */
+    private String description;
+    private Map<String, Short> customColumnStyle;
+
+    DeviceExportHeadersEnum(String fileName, String description) {
+        this.fileName = fileName;
+        this.description = description;
+    }
+
+    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
+        this.fileName = fileName;
+        this.description = description;
+        this.customColumnStyle = customColumnStyle;
+    }
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Map<String, Short> getCustomColumnStyle() {
+        return this.customColumnStyle;
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
index e29dad3..5176638 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
@@ -5,7 +5,7 @@
 
 @Data
 @Component
-@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinateConvert")
+@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert")
 public class SluicewellProperties {
     private String coordinate;
 
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 44eccc8..a5dd0a7 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
@@ -253,24 +253,6 @@
         FROM bus_well_info
     </select>
 
-    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
-        SELECT STRENGTH AS data,
-               UPTIME   AS logtime
-        FROM data_gasliquid_gas
-        WHERE DEVCODE = #{devcode}
-        ORDER BY UPTIME
-                DESC LIMIT 1
-    </select>
-
-    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
-        SELECT LIQUIDDATA AS data,
-               UPTIME     AS logtime
-        FROM data_gasliquid_liquid
-        WHERE DEVCODE = #{devcode}
-        ORDER BY UPTIME
-                DESC LIMIT 1
-    </select>
-
 
 
 
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 03c6222..04bdc34 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -104,6 +104,7 @@
             <artifactId>casic-area-starter</artifactId>
             <version>${admin.version}</version>
         </dependency>
+
         <!--子项目包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
@@ -112,6 +113,17 @@
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
+            <artifactId>casic-sluicewell</artifactId>
+            <version>${pro.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-data-analysis</artifactId>
+            <version>${pro.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.casic</groupId>
             <artifactId>casic-device</artifactId>
             <version>${pro.version}</version>
         </dependency>
@@ -174,15 +186,6 @@
         </plugins>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
-                <excludes>
-                    <!--注意从编译结果目录开始算目录结构-->
-                    <exclude>/config/*/*</exclude>
-                    <exclude>/config/*-*.yml</exclude>
-                </excludes>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
                 <directory>src/main/java</directory>
                 <includes>
                     <include>**/*.xml</include>

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
new file mode 100644
index 0000000..79804bf
--- /dev/null
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -0,0 +1,526 @@
+package com.casic.missiles.modular.system.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.common.annotion.Permission;
+import com.casic.missiles.core.datascope.DataScope;
+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.enmus.DeviceExportEnum;
+import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备相关数据查询
+ *
+ * @author lwh
+ */
+@Slf4j
+@RestController
+public class DeviceWellDataController extends ExportController {
+    @Resource
+    private IDataAnalysisService deviceService;
+    @Resource
+    private AbstractPermissionContext permissionService;
+
+
+    @GetMapping(value = "/welldata/list")
+    @Permission
+    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+
+        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+    }
+
+    @GetMapping(value = "/liquiddata/list")
+    @Permission
+    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
+        if (CollectionUtil.isEmpty(page.orders())) {
+            OrderItem orderItem = new OrderItem();
+            orderItem.setColumn("UPTIME");
+            orderItem.setAsc(false);
+            page.addOrder(orderItem);
+        }
+        //查询数据权限 使用默认DEPTID 字段
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        list.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(list);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    @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.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.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DeviceMonitorDataDto.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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        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();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 管盯数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        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);
+    }
+
+    /**
+     * 燃气数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
+    }
+
+
+    /**
+     * 有害气体数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/harmfuldata/list")
+    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 有害气体数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/tempdata/list")
+    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温湿度数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/temppressdata/list")
+    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    /**
+     * 温度压力数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 温湿度数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 开挖监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/digdata/list")
+    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 开挖监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.DIGDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 井盖定位监测仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/welllocadata/list")
+    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖定位监测仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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);
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 噪声记录仪数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/noisedata/list")
+    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 噪声记录仪数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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());
+    }
+
+
+    /**
+     * 根据权属单位统计报警次数
+     *
+     * @param deviceType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/statics/alarmsByDept")
+    @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());
+
+        return ResponseData.success(list);
+    }
+
+
+    /**
+     * 燃气液位一体化数据查询
+     *
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/liquidGasData/list")
+    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
+        Page<Map<String, Object>> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 燃气液位一体化数据导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param sensorType
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @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.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");
+                }
+            }
+        }
+        //TODO 导出表头设置
+        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+    }
+
+    /**
+     * 数据列表查询
+     *
+     * @param wellCode
+     * @param watchType
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @GetMapping(value = "/data/list")
+    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
+        return ResponseData.success(mapList);
+    }
+
+}
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 149fb82..328ca97 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
@@ -1,13 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.model.BusWellInfo;
-import com.casic.missiles.core.datascope.DataScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +40,40 @@
 
     DeviceData wellcoverlocaData(@Param("devcode") String devcode);
 
-    DeviceData lgGasData(@Param("devcode") String devcode);//燃气液位
-
-    DeviceData lgLiquidData(@Param("devcode") String devcode);//燃气液位
-
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgGasData(@Param("devcode") String devcode);
+    /**
+     * 燃气液位
+     * @param devcode
+     * @return
+     */
+    DeviceData lgLiquidData(@Param("devcode") String devcode);
 
     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<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<Map<String, Object>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+
+    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 }
diff --git a/casic-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 6d7edb3..bb2fbee 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
@@ -167,4 +167,824 @@
             #{i}
         </foreach>
     </select>
+
+    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT STRENGTH AS data,
+               UPTIME   AS logtime
+        FROM data_gasliquid_gas
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+
+    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
+        SELECT LIQUIDDATA AS data,
+               UPTIME     AS logtime
+        FROM data_gasliquid_liquid
+        WHERE DEVCODE = #{devcode}
+        ORDER BY UPTIME
+                DESC LIMIT 1
+    </select>
+    <sql id="upTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        DEVICETYPE,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        <include refid="upTime_toChar"/>
+        as UPTIME,
+        LIQUIDDATA,
+        CELL,
+        DESCN,
+        DEPTID,
+        WELLCODE,
+        WELLID,
+        DEVICEID,
+        VALID,
+        DEVICETYPENAME
+        FROM LIQUID_VIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY UPTIME DESC
+    </select>
+
+    <sql id="keywords_sql" databaseId="oracle">
+        '%' || #{keywords}|| '%'
+    </sql>
+    <sql id="keywords_sql" databaseId="mysql">
+        CONCAT('%',#{keywords},'%')
+    </sql>
+    <sql id="begintime_sql" databaseId="oracle">
+        TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+    <sql id="endtime_sql">
+        TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss')
+    </sql>
+
+
+    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.LIQUIDDATA AS data
+        FROM
+        data_gasliquid_liquid glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
+
+    <select id="selectLiquidDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        liquiddata
+        FROM
+        (
+        (
+        SELECT
+        dl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dl.WELL_CODE AS wellCode,
+        dl.DESCN AS descn,
+        dl.CELL AS cell,
+        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dl.LIQUIDDATA AS liquiddata
+        FROM
+        data_liquid dl
+        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgl.WELL_CODE AS wellCode,
+        dgl.DESCN AS descn,
+        dgl.CELL AS cell,
+        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgl.LIQUIDDATA AS liquiddata
+        FROM
+        data_gasliquid_liquid dgl
+        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectTempDataList" resultType="map">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectHarmfulDataList" resultType="map">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ORDER BY uptime asc
+    </select>
+
+    <select id="selectGasDataList" resultType="map">
+        SELECT
+        devcode,
+        deviceType,
+        deviceTypeName,
+        deptid,
+        wellCode,
+        descn,
+        cell,
+        uptime,
+        logtime,
+        strength
+        FROM
+        (
+        (
+        SELECT
+        dg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        ) UNION ALL
+        (
+        SELECT
+        dgg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dgg.WELL_CODE AS wellCode,
+        dgg.DESCN AS descn,
+        dgg.CELL AS cell,
+        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
+        dgg.STRENGTH AS strength
+        FROM
+        data_gasliquid_gas dgg
+        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="wellCode != null and wellCode != ''">
+                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+        )
+        ) t1
+        ORDER BY uptime asc
+    </select>
+    <sql id="logTime_toChar" databaseId="mysql">
+        DATE_FORMAT(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"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        DEVCODE,
+        deviceType,
+        <include refid="logTime_toChar"/>
+        as LOGTIME,
+        DESCN,
+        `STATUS`,
+        DEPTID,
+        wellCode,
+        wellId,
+        deviceId,
+        VALID,
+        deviceTypeName
+        FROM WELLCOVER_MONITORVIEW
+        <where>
+            <if test="deptid != null and deptid !=''">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and LOGTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and LOGTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (DEVCODE like
+                <include refid="keywords_sql"/>
+                OR wellCode LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY LOGTIME DESC
+    </select>
+
+    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_gas dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <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>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dhg.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dhg.WELL_CODE AS wellCode,
+        dhg.DESCN AS descn,
+        dhg.CO AS CO,
+        dhg.CH4 AS CH4,
+        dhg.H2S AS H2S,
+        dhg.O2 AS O2,
+        dhg.SWITCH AS switch,
+        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
+        data_harmful_gas dhg
+        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dhg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dhg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dhg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dhg.UPTIME DESC
+    </select>
+
+    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.HUMIDITY AS humidity,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_hum dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dth.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dth.WELL_CODE AS wellCode,
+        dth.DESCN AS descn,
+        dth.CELL AS cell,
+        dth.TEMPERATURE AS temperature,
+        dth.PRESS AS press,
+        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_temp_press dth
+        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dth.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dth.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dth.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dth.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dth.UPTIME DESC
+    </select>
+
+
+
+    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dd.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dd.WELL_CODE AS wellCode,
+        dd.DESCN AS descn,
+        dd.DDATA AS ddata,
+        dd.CELL AS cell,
+        dd.FREQUENCY AS frequency,
+        DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_dig dd
+        INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dd.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dd.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dd.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dd.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dd.UPTIME DESC
+    </select>
+
+    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT
+        dwl.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dwl.WELL_CODE AS wellCode,
+        dwl.DESCN AS descn,
+        dwl.CELL AS cell,
+        dwl.LAT AS lat,
+        dwl.LNG AS lng,
+        DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_wellcover_loca dwl
+        INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dwl.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dwl.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dwl.UPTIME DESC
+    </select>
+
+    <select id="selectNoiseDataScopePage" resultType="map">
+        SELECT
+        dn.DEVCODE AS devcode,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dn.WELL_CODE AS wellCode,
+        dn.DESCN AS descn,
+        dn.FREQUENCY AS frequency,
+        dn.DDATA AS ddata,
+        dn.CELL AS cell,
+        DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
+        DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
+        FROM
+        data_noise dn
+        INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dn.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dn.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dn.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dn.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dn.UPTIME DESC
+    </select>
+    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
+    >
+        SELECT
+        SD.SIMPLENAME AS deptname,
+        SA.alarmDevices,
+        SA.alarmTimes,
+        SD.ID AS "DEPTID"
+        FROM SYS_DEPT SD
+        LEFT JOIN
+        (
+        SELECT
+        count(1) AS alarmDevices,
+        sum(NUM) AS alarmTimes,
+        DEPTID
+        FROM
+        (
+        SELECT
+        count(1) AS NUM,DEPTID,b.DEVICE_ID
+        FROM alarm_records a
+        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
+        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
+        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
+        WHERE
+        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
+        <if test="beginTime != null and beginTime != '' ">
+            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and a.ALARM_TIME &lt;
+            <include refid="endtime_sql"/>
+        </if>
+        <if test="deviceType != null and deviceType != ''">
+            and d.DEVICE_TYPE = #{deviceType}
+        </if>
+        GROUP BY
+        c.DEPTID,
+        b.DEVICE_ID
+        ) A
+        GROUP BY DEPTID
+        ) SA ON SA.DEPTID = SD.ID
+        <where>
+            AND SD.DEPTTYPE = '03'
+            <if test="deptId != null">
+                <choose>
+                    <when test="searchCurr">
+                        and   SD.ID = #{deptId}
+                    </when>
+                    <otherwise>
+                        AND  SD.PID = #{deptId}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
+        SELECT
+        glview.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        glview.WELL_CODE AS wellCode,
+        glview.DESCN AS descn,
+        glview.CELL AS cell,
+        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        glview.STRENGTH AS data
+        FROM
+        data_gasliquid_gas glview
+        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
+        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
+        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bwi.VALID = '1'
+            <if test="deptIds != null">
+                and bwi.DEPTID in
+                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
+                    #{i}
+                </foreach>
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and glview.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and glview.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (glview.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR glview.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY glview.UPTIME DESC
+    </select>
 </mapper>
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 69c8c60..a4923e2 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
@@ -1,14 +1,13 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
-import com.casic.missiles.modular.system.dto.BfztCountDataDto;
-import com.casic.missiles.modular.system.dto.BusWellInfoDto;
-import com.casic.missiles.modular.system.dto.DeviceDataDto;
-import com.casic.missiles.modular.system.dto.WatchDataDto;
+import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计服务接口
@@ -44,8 +43,80 @@
      * @return 设备监测数据
      */
     List<DeviceDataDto> getDeviceDatas(String devTypename, String devcode, String status);
+
     List<WatchDataDto> getWatchDatas(Long id);
 
 
     BfztCountDataDto getBfztCountData(List<Long> deptIds, Boolean isApp);
+    /**
+     * 根据条件检索井盖监测数据列表
+     *
+     * @param dataScope 数据权限
+     * @param page      分页查询
+     * @param deptid    组织ID
+     * @param beginTime 起始时间
+     * @param endTime   结束时间
+     * @param keywords  关键字
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据检索条件查询液位检测数据
+     *
+     * @param dataScope 数据权限
+     * @param page      分页参数
+     * @param deptid    组织id
+     * @param beginTime
+     * @param endTime
+     * @param keywords
+     * @return
+     */
+    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<Map<String, Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 根据权属单位统计设备数及告警次数
+     *
+     * @param deviceType 设备类型
+     * @param beginTime  起止时间
+     * @param endTime    结束时间
+     * @param dataScope  数据权限
+     * @return
+     */
+    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<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 288a828..c72d233 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
@@ -1,9 +1,15 @@
 package com.casic.missiles.modular.system.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+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.enmus.HarmfulGasBusiness;
@@ -19,7 +25,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计分析
@@ -33,7 +41,8 @@
     private AbstractDictService dictService;
     @Resource
     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);
@@ -379,8 +388,162 @@
                     break;
             }
         }
-
         return watchDataDtos;
     }
+    //数据相关统计------------------------------------------------------------
+    @Override
+    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        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())));
+        }
+        return mapList;
+    }
+
+    @Override
+    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
+        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) {
+        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<>();
+        if ("liquid".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        if ("gas".equals(sensorType)) {
+            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
+        }
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+            if ("liquid".equals(sensorType)) {
+                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
+                if (liquiddata <= 0) {
+                    map.put("data", "正常水位");
+                }
+            }
+        }
+        return mapList;
+    }
+    @Override
+    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
+        if (StrUtil.isAllEmpty(beginTime, endTime)) {
+            Calendar calendar = Calendar.getInstance();
+            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+            calendar.add(Calendar.DATE, -7);
+            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        switch (watchType) {
+            case "liquid":
+                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "gas":
+                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "temp":
+                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            case "harmful":
+                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
+                break;
+            default:
+                break;
+        }
+        for (Map<String, Object> map : list) {
+            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
+            setCompany(map);
+        }
+        return list;
+    }
+    private void setCompany(Map<String, Object> dataMap) {
+        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
+            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
+            if (CollectionUtil.isNotEmpty(parentDepts)) {
+                Long companyId = parentDepts.get(parentDepts.size() - 1);
+                dataMap.put("companyId", companyId);
+                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
+            }
+        }
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
deleted file mode 100644
index 854aaaa..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.casic.missiles.modular.system.constant;
-
-public class DeviceConst {
-    /**
-     * 导出模板路径
-     */
-    public static final String EXPORT_TEMP_PATH = "/config/export/";
-
-    /**
-     * 模板下载路径
-     */
-    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
-    public static final String YES = "1";
-    public static final String NO = "0";
-    public static final String DEPT_TYPE_ORG = "03";
-    /**
-     * 设备类型查询
-     */
-    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
-
-    /**
-     * 设备类型添加日志KEY
-     */
-    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
-
-    /**
-     * app版本更新路径
-     */
-    public static final String APP_DOWNLOAD = "apk/";
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
index 21522f9..09cea3c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConcentratorController.java
@@ -19,7 +19,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.ModularDictConst;
 import com.casic.missiles.modular.system.dict.ConcentDict;
-import com.casic.missiles.modular.system.enums.DeviceExportEnum;
+import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.BusConcentrator;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import org.slf4j.Logger;
@@ -39,8 +39,9 @@
 /**
  * 控制器
  * 井深  井坐标 设备坐标问题
- *      负责部门  权属部门 责任人
- *  布防撤防
+ * 负责部门  权属部门 责任人
+ * 布防撤防
+ *
  * @author dev
  * @Date 2019-06-03 10:02:11
  */
@@ -121,7 +122,6 @@
         return ResponseData.success();
     }
 
-
     //    @ApiOperation("修改集中器")
     @RequestMapping(value = "/update")
     @BussinessLog(value = "修改集中器", key = "concencode,simid,position,lat,lng", dict = ConcentDict.class)
@@ -172,7 +172,7 @@
         //忽略导出属性
         Set<String> excludeColumnFiledNames = new HashSet<>();
         excludeColumnFiledNames.add("deptid");
-        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(),excludeColumnFiledNames);
+        super.exportExcelExcludeColumns(BusConcentrator.class, page.getRecords(), DeviceExportEnum.BUSCONCENTRATOR_EXPORT.getFileName(), excludeColumnFiledNames);
 
     }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
deleted file mode 100644
index 29ca25b..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package com.casic.missiles.modular.system.controller;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.config.DeviceServerProperties;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
-import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.common.annotion.Permission;
-import com.casic.missiles.core.datascope.DataScope;
-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.enums.DeviceExportEnum;
-import com.casic.missiles.modular.system.service.IDeviceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class WellDataController extends ExportController {
-    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
-    @Autowired
-    private IDeviceService deviceService;
-    @Resource
-    private AbstractPermissionContext permissionService;
-    @Autowired
-    private DeviceServerProperties deviceServerProperties;
-
-    @GetMapping(value = "/welldata/list")
-    @Permission
-    public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectWellDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-
-        super.exportExcel(DeviceMonitorDataDto.class, list, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
-    }
-
-    @GetMapping(value = "/liquiddata/list")
-    @Permission
-    public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceMonitorDataDto> page = PageFactory.defaultPage();
-        if (CollectionUtil.isEmpty(page.orders())) {
-            OrderItem orderItem = new OrderItem();
-            orderItem.setColumn("UPTIME");
-            orderItem.setAsc(false);
-            page.addOrder(orderItem);
-        }
-        //查询数据权限 使用默认DEPTID 字段
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceMonitorDataDto> list = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        list.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        page.setRecords(list);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    @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.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.forEach(deviceDto -> {
-            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
-        });
-        super.exportExcel(DeviceMonitorDataDto.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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        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();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTubeDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 管盯数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.setCurrent(1);
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-
-        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);
-    }
-
-    /**
-     * 燃气数据导出
-     *
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(), mapList, DeviceExportEnum.GASDATA_EXPORT.getFileName());
-    }
-
-
-    /**
-     * 有害气体数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/harmfuldata/list")
-    public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectHarmfulDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 有害气体数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.HARMFULDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/tempdata/list")
-    public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温湿度数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/temppressdata/list")
-    public Object tempPressdataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectTempPressDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-
-    /**
-     * 温度压力数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 温湿度数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.TEMPDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 开挖监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/digdata/list")
-    public Object digDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDigDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 开挖监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.DIGDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 井盖定位监测仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/welllocadata/list")
-    public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectWellLocDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 井盖定位监测仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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);
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.WELLLOCDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 噪声记录仪数据查询
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/noisedata/list")
-    public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 噪声记录仪数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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());
-    }
-
-
-    /**
-     * 根据权属单位统计报警次数
-     * @param deviceType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/statics/alarmsByDept")
-    @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());
-
-        return ResponseData.success(list);
-    }
-
-
-    /**
-     * 燃气液位一体化数据查询
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/liquidGasData/list")
-    public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<Map<String, Object>> page = PageFactory.defaultPage();
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-        page.setRecords(mapList);
-        return ResponseData.success(super.packForBT(page));
-    }
-
-    /**
-     * 燃气液位一体化数据导出
-     * @param response
-     * @param keywords
-     * @param deptid
-     * @param sensorType
-     * @param beginTime
-     * @param endTime
-     * @throws IOException
-     */
-    @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.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");
-                }
-            }
-        }
-        //TODO 导出表头设置
-        super.exportExcelMaps(new ArrayList<>(),mapList,DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
-    }
-
-    /**
-     * 数据列表查询
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
-     */
-    @GetMapping(value = "/data/list")
-    public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
-        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
-        return ResponseData.success(mapList);
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index b9ca243..041cb2a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -8,7 +8,6 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,45 +22,8 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline);
     List<DeviceInfoDto> getDeviceList(@Param("scope") DataScope dataScope);
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode);
-
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
-
-    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<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<DeviceCodeSelectDto> selectDevicesByConfig(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType, @Param("configStatus") String configStatus);
-
-    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<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>> selectLiquidDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectGasDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectTempDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
-    List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope")DataScope dataScope, @Param("wellCode")String wellCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
-
     /**
      * 查询设备信息
      * @param id 设备主键
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 c956057..315631b 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
@@ -102,474 +102,9 @@
     <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"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        DEVICETYPE,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        <include refid="upTime_toChar"/>
-        as UPTIME,
-        LIQUIDDATA,
-        CELL,
-        DESCN,
-        DEPTID,
-        WELLCODE,
-        WELLID,
-        DEVICEID,
-        VALID,
-        DEVICETYPENAME
-        FROM LIQUID_VIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY UPTIME DESC
-    </select>
-
-    <select id="selectWellDataScopePage" resultType="com.casic.missiles.modular.system.dto.DeviceMonitorDataDto"
-            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        DEVCODE,
-        deviceType,
-        <include refid="logTime_toChar"/>
-        as LOGTIME,
-        DESCN,
-        `STATUS`,
-        DEPTID,
-        wellCode,
-        wellId,
-        deviceId,
-        VALID,
-        deviceTypeName
-        FROM WELLCOVER_MONITORVIEW
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and LOGTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and LOGTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (DEVCODE like
-                <include refid="keywords_sql"/>
-                OR wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY LOGTIME DESC
-    </select>
-
-    <select id="selectGasDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dg.DEVCODE AS devcode ,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dg.WELL_CODE AS wellCode,
-            dg.DESCN AS descn,
-            dg.CELL AS cell,
-            DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-            DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-            dg.STRENGTH AS strength
-        FROM
-            data_gas dg
-            INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
 
 
 
-    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dg.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_tube dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <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>
-            <if test="keywords != null and keywords !=''">
-                and (dg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dg.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dhg.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dhg.WELL_CODE AS wellCode,
-            dhg.DESCN AS descn,
-            dhg.CO AS CO,
-            dhg.CH4 AS CH4,
-            dhg.H2S AS H2S,
-            dhg.O2 AS O2,
-            dhg.SWITCH AS switch,
-            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
-            data_harmful_gas dhg
-            INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dhg.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dhg.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dhg.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dhg.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dhg.UPTIME DESC
-    </select>
-
-    <select id="selectTempDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dth.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dth.WELL_CODE AS wellCode,
-            dth.DESCN AS descn,
-            dth.CELL AS cell,
-            dth.TEMPERATURE AS temperature,
-            dth.HUMIDITY AS humidity,
-            DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_temp_hum dth
-            INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectTempPressDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.PRESS AS press,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_press dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dth.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dth.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dth.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dth.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dth.UPTIME DESC
-    </select>
-
-
-
-    <select id="selectDigDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dd.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dd.WELL_CODE AS wellCode,
-            dd.DESCN AS descn,
-            dd.DDATA AS ddata,
-            dd.CELL AS cell,
-            dd.FREQUENCY AS frequency,
-            DATE_FORMAT( dd.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dd.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_dig dd
-            INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dd.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dd.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dd.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dd.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dd.UPTIME DESC
-    </select>
-
-    <select id="selectWellLocDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
-        SELECT
-            dwl.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dwl.WELL_CODE AS wellCode,
-            dwl.DESCN AS descn,
-            dwl.CELL AS cell,
-            dwl.LAT AS lat,
-            dwl.LNG AS lng,
-            DATE_FORMAT( dwl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dwl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_wellcover_loca dwl
-            INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dwl.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dwl.UPTIME DESC
-    </select>
-
-    <select id="selectNoiseDataScopePage" resultType="map">
-        SELECT
-            dn.DEVCODE AS devcode,
-            bd.DEVICE_TYPE AS deviceType,
-            bdt.TYPE_NAME AS deviceTypeName,
-            bwi.DEPTID AS deptid,
-            dn.WELL_CODE AS wellCode,
-            dn.DESCN AS descn,
-            dn.FREQUENCY AS frequency,
-            dn.DDATA AS ddata,
-            dn.CELL AS cell,
-            DATE_FORMAT( dn.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-            DATE_FORMAT( dn.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-            data_noise dn
-            INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE
-            INNER JOIN bus_well_info bwi ON dn.WELL_CODE = bwi.WELL_CODE
-            INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dn.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dn.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dn.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR dn.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY dn.UPTIME DESC
-    </select>
-    <select id="alarmsStaticsByDept" resultType="com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto"
-    >
-        SELECT
-        SD.SIMPLENAME AS deptname,
-        SA.alarmDevices,
-        SA.alarmTimes,
-        SD.ID AS "DEPTID"
-        FROM SYS_DEPT SD
-        LEFT JOIN
-        (
-        SELECT
-        count(1) AS alarmDevices,
-        sum(NUM) AS alarmTimes,
-        DEPTID
-        FROM
-        (
-        SELECT
-        count(1) AS NUM,DEPTID,b.DEVICE_ID
-        FROM alarm_records a
-        INNER JOIN bus_device_well b ON a.DEVICE_ID = b.DEVICE_ID
-        INNER JOIN bus_well_info c ON c.ID = b.WELL_ID
-        INNER JOIN bus_device d ON d.ID = b.DEVICE_ID
-        WHERE
-        b.VALID = '1' AND c.VALID = '1' AND d.VALID = '1'
-        <if test="beginTime != null and beginTime != '' ">
-            and a.ALARM_TIME &gt;<include refid="begintime_sql"/>
-        </if>
-        <if test="endTime != null and endTime != ''">
-            and a.ALARM_TIME &lt;
-            <include refid="endtime_sql"/>
-        </if>
-        <if test="deviceType != null and deviceType != ''">
-            and d.DEVICE_TYPE = #{deviceType}
-        </if>
-        GROUP BY
-        c.DEPTID,
-        b.DEVICE_ID
-        ) A
-        GROUP BY DEPTID
-        ) SA ON SA.DEPTID = SD.ID
-        <where>
-            AND SD.DEPTTYPE = '03'
-            <if test="deptId != null">
-                <choose>
-                    <when test="searchCurr">
-                        and   SD.ID = #{deptId}
-                    </when>
-                    <otherwise>
-                        AND  SD.PID = #{deptId}
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-    </select>
 
     <sql id="keywords_sql" databaseId="oracle">
         '%' || #{keywords}|| '%'
@@ -592,316 +127,6 @@
     </sql>
 
 
-
-    <select id="selectGasLiquidDataGasScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.STRENGTH AS data
-        FROM
-        data_gasliquid_gas glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectGasLiquidDataLiquidScopePage"  resultType="map">
-        SELECT
-        glview.DEVCODE AS devcode ,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        glview.WELL_CODE AS wellCode,
-        glview.DESCN AS descn,
-        glview.CELL AS cell,
-        DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-        DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
-        glview.LIQUIDDATA AS data
-        FROM
-        data_gasliquid_liquid glview
-        LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
-        LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE
-        LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bwi.VALID = '1'
-            <if test="deptIds != null">
-                and bwi.DEPTID in
-                <foreach collection="deptIds" index="index" item="i" open="(" separator="," close=")">
-                    #{i}
-                </foreach>
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and glview.UPTIME &gt;<include refid="begintime_sql"/>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and glview.UPTIME &lt;
-                <include refid="endtime_sql"/>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (glview.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR glview.WELL_CODE LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
-        ORDER BY glview.UPTIME DESC
-    </select>
-
-    <select id="selectLiquidDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        liquiddata
-        FROM
-        (
-        (
-        SELECT
-        dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS wellCode,
-        dl.DESCN AS descn,
-        dl.CELL AS cell,
-        DATE_FORMAT( dl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dl.LIQUIDDATA AS liquiddata
-        FROM
-        data_liquid dl
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS wellCode,
-        dgl.DESCN AS descn,
-        dgl.CELL AS cell,
-        DATE_FORMAT( dgl.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgl.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgl.LIQUIDDATA AS liquiddata
-        FROM
-        data_gasliquid_liquid dgl
-        INNER JOIN bus_device bd ON dgl.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgl.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgl.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgl.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectTempDataList" resultType="map">
-        SELECT
-        dth.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dth.WELL_CODE AS wellCode,
-        dth.DESCN AS descn,
-        dth.CELL AS cell,
-        dth.TEMPERATURE AS temperature,
-        dth.HUMIDITY AS humidity,
-        DATE_FORMAT( dth.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dth.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime
-        FROM
-        data_temp_hum dth
-        INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dth.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dth.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dth.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dth.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectHarmfulDataList" resultType="map">
-        SELECT
-        dhg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dhg.WELL_CODE AS wellCode,
-        dhg.DESCN AS descn,
-        dhg.CO AS CO,
-        dhg.CH4 AS CH4,
-        dhg.H2S AS H2S,
-        dhg.O2 AS O2,
-        dhg.SWITCH AS switch,
-        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
-        data_harmful_gas dhg
-        INNER JOIN bus_device bd ON dhg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dhg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dhg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dhg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dhg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ORDER BY uptime asc
-    </select>
-
-    <select id="selectGasDataList" resultType="map">
-        SELECT
-        devcode,
-        deviceType,
-        deviceTypeName,
-        deptid,
-        wellCode,
-        descn,
-        cell,
-        uptime,
-        logtime,
-        strength
-        FROM
-        (
-        (
-        SELECT
-        dg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dg.WELL_CODE AS wellCode,
-        dg.DESCN AS descn,
-        dg.CELL AS cell,
-        DATE_FORMAT( dg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dg.STRENGTH AS strength
-        FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        ) UNION ALL
-        (
-        SELECT
-        dgg.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS deviceType,
-        bdt.TYPE_NAME AS deviceTypeName,
-        bwi.DEPTID AS deptid,
-        dgg.WELL_CODE AS wellCode,
-        dgg.DESCN AS descn,
-        dgg.CELL AS cell,
-        DATE_FORMAT( dgg.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime,
-        DATE_FORMAT( dgg.LOGTIME, '%Y-%m-%d %H:%i:%S' ) AS logtime,
-        dgg.STRENGTH AS strength
-        FROM
-        data_gasliquid_gas dgg
-        INNER JOIN bus_device bd ON dgg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dgg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="wellCode != null and wellCode != ''">
-                AND dgg.WELL_CODE LIKE CONCAT('%', #{wellCode}, '%')
-            </if>
-            <if test="beginTime != null and beginTime != ''">
-                AND dgg.UPTIME <![CDATA[ >= ]]> #{beginTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND dgg.UPTIME <![CDATA[ <= ]]> #{endTime}
-            </if>
-        </where>
-        )
-        ) t1
-        ORDER BY uptime asc
-    </select>
     <select id="getDeviceList" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
         SELECT id,
                devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
deleted file mode 100644
index f20e952..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-import com.casic.missiles.config.DeviceServerProperties;
-
-import com.casic.missiles.core.util.SpringContextHolder;
-
-public enum DeviceExportEnum  {
-
-    /**
-     *
-     */
-    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
-    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
-    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
-    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
-    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
-    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
-    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
-    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
-    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
-    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
-    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
-    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
-    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
-
-    /**
-     * 导出模板相对路径
-     */
-    private String fileTempPath;
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-
-    DeviceExportEnum(String fileTempPath, String fileName, String description) {
-        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-
-    public String getFileTempPath() {
-        return fileTempPath;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
deleted file mode 100644
index 5c52839..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportHeadersEnum.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.casic.missiles.modular.system.enums;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备导出标题枚举
- *
- * @author lwh
- */
-public enum DeviceExportHeadersEnum {
-    /**
-     * 设备导出
-     */
-    DEVICE_EXPORT(new HashMap<String, Short>() {
-        {
-            put("设备编号", (short) 6000);
-            put("设备名称", (short) 8000);
-            put("监控内容", (short) 6000);
-            put("设备位置", (short) 6000);
-            put("权属单位", (short) 8000);
-            put("井编号", (short) 6000);
-            put("集中器编号", (short) 6000);
-            put("安装时间", (short) 5000);
-        }
-    }, "device.xlsx", "井盖设备数据导出"
-    );
-
-    /**
-     * 下载文件名
-     */
-    private String fileName;
-    /**
-     * 描述信息
-     */
-    private String description;
-    private Map<String, Short> customColumnStyle;
-
-    DeviceExportHeadersEnum(String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-    }
-
-    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
-        this.fileName = fileName;
-        this.description = description;
-        this.customColumnStyle = customColumnStyle;
-    }
-
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public Map<String, Short> getCustomColumnStyle() {
-        return this.customColumnStyle;
-    }
-
-}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 090415c..81e52b1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -47,82 +47,7 @@
 
     List<String> addDeviceBatch(List<Device> results);
 
-    /**
-     * 根据条件检索井盖监测数据列表
-     *
-     * @param dataScope 数据权限
-     * @param page      分页查询
-     * @param deptid    组织ID
-     * @param beginTime 起始时间
-     * @param endTime   结束时间
-     * @param keywords  关键字
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 
-    /**
-     * 根据检索条件查询液位检测数据
-     *
-     * @param dataScope 数据权限
-     * @param page      分页参数
-     * @param deptid    组织id
-     * @param beginTime
-     * @param endTime
-     * @param keywords
-     * @return
-     */
-    List<DeviceMonitorDataDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectTempDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectDigDataScopePage(DataScope dataScope, Page<Map<String,Object>> 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<Map<String,Object>> selectNoiseDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
-
-    /**
-     * 根据权属单位统计设备数及告警次数
-     *
-     * @param deviceType 设备类型
-     * @param beginTime  起止时间
-     * @param endTime    结束时间
-     * @param dataScope  数据权限
-     * @return
-     */
-    List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
     void deleteByIds(List<Long> ids);
 
@@ -136,11 +61,4 @@
     List<DeviceCodeSelectDto> selectDevicesByConfig(DataScope dataScope, String deviceType, String configStatus);
 
     void registerGeTui(Long id, String clientid);
-
-    List<Map<String,Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
-
-    /**
-     * 燃气数据查询
-     */
-    List<Map<String,Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 }
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 de9111e..3712c31 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
@@ -1,15 +1,12 @@
 package com.casic.missiles.modular.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
-import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.common.constant.Const;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.exception.ServiceException;
@@ -26,7 +23,6 @@
 import org.springframework.validation.FieldError;
 import org.springframework.validation.Validator;
 
-import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -53,8 +49,6 @@
     @Autowired
     private IDeviceWellService deviceWellService;
 
-    @Resource
-    private AbstractPermissionContext permissionService;
 
     @Autowired
     private Validator validator;
@@ -306,95 +300,9 @@
         return list;
     }
 
-    @Override
-    public List<DeviceMonitorDataDto> selectWellDataScopePage(DataScope dataScope, Page<DeviceMonitorDataDto> 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) {
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        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())));
-        }
-        return mapList;
-    }
-
-    @Override
-    public List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId) {
-        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 void deleteByIds(List<Long> ids) {
@@ -444,77 +352,6 @@
         return new DeviceWell(deviceId, wellId, new Date(), "1");
     }
 
-
-    @Override
-    public List<Map<String, Object>> selectGasLiquidDataScopePage(DataScope dataScope, Page<Map<String, Object>> 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<>();
-        if ("liquid".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        if ("gas".equals(sensorType)) {
-            mapList = this.baseMapper.selectGasLiquidDataGasScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
-        }
-        for (Map<String, Object> map : mapList) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-            if ("liquid".equals(sensorType)) {
-                float liquiddata = Float.valueOf(String.valueOf(map.get("data")));
-                if (liquiddata <= 0) {
-                    map.put("data", "正常水位");
-                }
-            }
-        }
-        return mapList;
-    }
-
-    private void setCompany(Map<String, Object> dataMap) {
-        if (ObjectUtil.isNotEmpty(dataMap.get("deptid"))) {
-            List<Long> parentDepts = permissionService.getDeptService().getParentListById(dataMap.get("deptid").toString());
-            if (CollectionUtil.isNotEmpty(parentDepts)) {
-                Long companyId = parentDepts.get(parentDepts.size() - 1);
-                dataMap.put("companyId", companyId);
-                dataMap.put("companyName", permissionService.getDeptService().getDeptName(companyId));
-            }
-        }
-    }
-
-    @Override
-    public List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime) {
-        if (StrUtil.isAllEmpty(beginTime, endTime)) {
-            Calendar calendar = Calendar.getInstance();
-            endTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-            calendar.add(Calendar.DATE, -7);
-            beginTime = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss");
-        }
-        List<Map<String, Object>> list = new ArrayList<>();
-        switch (watchType) {
-            case "liquid":
-                list = this.baseMapper.selectLiquidDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "gas":
-                list = this.baseMapper.selectGasDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "temp":
-                list = this.baseMapper.selectTempDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            case "harmful":
-                list = this.baseMapper.selectHarmfulDataList(dataScope, wellCode, beginTime, endTime);
-                break;
-            default:
-                break;
-        }
-        for (Map<String, Object> map : list) {
-            map.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(map.get("deptid").toString())));
-            setCompany(map);
-        }
-        return list;
-    }
-
     @Override
     public List<DeviceInfoDto> getDeviceList(DataScope dataScope) {
         return this.baseMapper.getDeviceList(dataScope);
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
new file mode 100644
index 0000000..854aaaa
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/constant/DeviceConst.java
@@ -0,0 +1,30 @@
+package com.casic.missiles.modular.system.constant;
+
+public class DeviceConst {
+    /**
+     * 导出模板路径
+     */
+    public static final String EXPORT_TEMP_PATH = "/config/export/";
+
+    /**
+     * 模板下载路径
+     */
+    public static final String DEVICE_DOWNLOAD_TEMP = "/config/temp/";
+    public static final String YES = "1";
+    public static final String NO = "0";
+    public static final String DEPT_TYPE_ORG = "03";
+    /**
+     * 设备类型查询
+     */
+    public static final String DEVICE_QUERY_DEVICE_TYPE = "DEVICE_TYPE";
+
+    /**
+     * 设备类型添加日志KEY
+     */
+    public static final String DEVICE_ADD_LOG_KEY = "devcode,deviceName,deviceType,wellCode,concenCode";
+
+    /**
+     * app版本更新路径
+     */
+    public static final String APP_DOWNLOAD = "apk/";
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
new file mode 100644
index 0000000..aa09c1f
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportEnum.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.system.enmus;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+
+public enum DeviceExportEnum  {
+
+    /**
+     *
+     */
+    WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
+    LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
+    GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
+    HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
+    TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
+    TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
+    DIGDATA_EXPORT("digData.xlsx","digData.xlsx","开挖数据"),
+    WELLLOCDATA_EXPORT("wellLocData.xlsx","wellLocData.xlsx","井盖定位数据"),
+    NOISEDATA_EXPORT("noiseData.xlsx","noiseData.xlsx","噪声记录仪数据"),
+    BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
+    DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
+    LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据");
+
+    /**
+     * 导出模板相对路径
+     */
+    private String fileTempPath;
+    /**
+     * 下载文件名
+     */
+    private String fileName;
+    /**
+     * 描述信息
+     */
+    private String description;
+
+    DeviceExportEnum(String fileTempPath, String fileName, String description) {
+//        this.fileTempPath = SpringContextHolder.getBean(DeviceServerProperties.class).getExportPath().concat(fileTempPath);
+        this.fileName = fileName;
+        this.description = description;
+    }
+
+
+    public String getFileTempPath() {
+        return fileTempPath;
+    }
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+
+    public String getDescription() {
+        return description;
+    }
+}
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
new file mode 100644
index 0000000..5c52839
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enmus/DeviceExportHeadersEnum.java
@@ -0,0 +1,65 @@
+package com.casic.missiles.modular.system.enums;
+
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备导出标题枚举
+ *
+ * @author lwh
+ */
+public enum DeviceExportHeadersEnum {
+    /**
+     * 设备导出
+     */
+    DEVICE_EXPORT(new HashMap<String, Short>() {
+        {
+            put("设备编号", (short) 6000);
+            put("设备名称", (short) 8000);
+            put("监控内容", (short) 6000);
+            put("设备位置", (short) 6000);
+            put("权属单位", (short) 8000);
+            put("井编号", (short) 6000);
+            put("集中器编号", (short) 6000);
+            put("安装时间", (short) 5000);
+        }
+    }, "device.xlsx", "井盖设备数据导出"
+    );
+
+    /**
+     * 下载文件名
+     */
+    private String fileName;
+    /**
+     * 描述信息
+     */
+    private String description;
+    private Map<String, Short> customColumnStyle;
+
+    DeviceExportHeadersEnum(String fileName, String description) {
+        this.fileName = fileName;
+        this.description = description;
+    }
+
+    DeviceExportHeadersEnum(Map<String, Short> customColumnStyle, String fileName, String description) {
+        this.fileName = fileName;
+        this.description = description;
+        this.customColumnStyle = customColumnStyle;
+    }
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Map<String, Short> getCustomColumnStyle() {
+        return this.customColumnStyle;
+    }
+
+}
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
index e29dad3..5176638 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/config/SluicewellProperties.java
@@ -5,7 +5,7 @@
 
 @Data
 @Component
-@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinateConvert")
+@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert")
 public class SluicewellProperties {
     private String coordinate;
 
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 44eccc8..a5dd0a7 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
@@ -253,24 +253,6 @@
         FROM bus_well_info
     </select>
 
-    <select id="lgGasData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
-        SELECT STRENGTH AS data,
-               UPTIME   AS logtime
-        FROM data_gasliquid_gas
-        WHERE DEVCODE = #{devcode}
-        ORDER BY UPTIME
-                DESC LIMIT 1
-    </select>
-
-    <select id="lgLiquidData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
-        SELECT LIQUIDDATA AS data,
-               UPTIME     AS logtime
-        FROM data_gasliquid_liquid
-        WHERE DEVCODE = #{devcode}
-        ORDER BY UPTIME
-                DESC LIMIT 1
-    </select>
-
 
 
 
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 03c6222..04bdc34 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -104,6 +104,7 @@
             <artifactId>casic-area-starter</artifactId>
             <version>${admin.version}</version>
         </dependency>
+
         <!--子项目包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
@@ -112,6 +113,17 @@
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
+            <artifactId>casic-sluicewell</artifactId>
+            <version>${pro.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.casic</groupId>
+            <artifactId>casic-data-analysis</artifactId>
+            <version>${pro.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.casic</groupId>
             <artifactId>casic-device</artifactId>
             <version>${pro.version}</version>
         </dependency>
@@ -174,15 +186,6 @@
         </plugins>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
-                <excludes>
-                    <!--注意从编译结果目录开始算目录结构-->
-                    <exclude>/config/*/*</exclude>
-                    <exclude>/config/*-*.yml</exclude>
-                </excludes>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
                 <directory>src/main/java</directory>
                 <includes>
                     <include>**/*.xml</include>
diff --git a/pom.xml b/pom.xml
index 0702c13..c51cd97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
         <module>casic-sluicewell</module>
         <module>casic-data-analysis</module>
         <module>casic-device</module>
-        <module>casic-alarm</module>
+<!--        <module>casic-alarm</module>-->
         <module>casic-server-support</module>
     </modules>
     <parent>