diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 0d199fc..8236dc7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -12,7 +12,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
-import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +82,66 @@
     }
 
     /**
+     * 井盖液位一体化列表
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/list-page")
+    @Permission
+    public Object wellliquiddataListPage(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖液位一体化导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/export")
+    @Permission
+    public void wellliquiddataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DataWellLiquidDto.class, deviceDataDtoList, DeviceExportEnum.WELLLIQUIDDATA_EXPORT.getFileName());
+    }
+
+
+    /**
      * @param keywords
      * @param deptid
      * @param beginTime

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 0d199fc..8236dc7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -12,7 +12,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
-import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +82,66 @@
     }
 
     /**
+     * 井盖液位一体化列表
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/list-page")
+    @Permission
+    public Object wellliquiddataListPage(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖液位一体化导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/export")
+    @Permission
+    public void wellliquiddataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DataWellLiquidDto.class, deviceDataDtoList, DeviceExportEnum.WELLLIQUIDDATA_EXPORT.getFileName());
+    }
+
+
+    /**
      * @param keywords
      * @param deptid
      * @param beginTime
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 0b99b60..cd21bad 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,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
@@ -74,6 +75,8 @@
 
     List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<DataWellLiquidDto>  getWellliquiddataList(@Param("dataScope") DataScope dataScope, @Param("page") Page<DataWellLiquidDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") 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
index 0d199fc..8236dc7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -12,7 +12,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
-import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +82,66 @@
     }
 
     /**
+     * 井盖液位一体化列表
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/list-page")
+    @Permission
+    public Object wellliquiddataListPage(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖液位一体化导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/export")
+    @Permission
+    public void wellliquiddataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DataWellLiquidDto.class, deviceDataDtoList, DeviceExportEnum.WELLLIQUIDDATA_EXPORT.getFileName());
+    }
+
+
+    /**
      * @param keywords
      * @param deptid
      * @param beginTime
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 0b99b60..cd21bad 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,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
@@ -74,6 +75,8 @@
 
     List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<DataWellLiquidDto>  getWellliquiddataList(@Param("dataScope") DataScope dataScope, @Param("page") Page<DataWellLiquidDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
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 c586d01..63decc1 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
@@ -338,6 +338,57 @@
         ORDER BY UPTIME DESC
     </select>
 
+    <select id="getWellliquiddataList"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DataWellLiquidDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT bd.devcode,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.LOGTIME"/>
+        </include>
+        AS "logtime",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.UPTIME"/>
+        </include>
+        AS "uptime",
+        status AS status,
+        bd.device_Type  as "deviceType",
+        cell,
+        descn,
+        deptid,
+        bwi.well_code as "wellCode",
+        type_name as "deviceTypeName"
+        FROM data_well_liquid  dwl
+        JOIN bus_device  bd  ON bd.DEVCODE=dwl.DEVCODE
+        JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        where bd.valid='1' AND  bwi.valid='1'
+        <where>
+            <if test="deptid != null and deptid != -1 ">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </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="selectGasLiquidDataLiquidScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         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
index 0d199fc..8236dc7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -12,7 +12,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
-import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +82,66 @@
     }
 
     /**
+     * 井盖液位一体化列表
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/list-page")
+    @Permission
+    public Object wellliquiddataListPage(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖液位一体化导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/export")
+    @Permission
+    public void wellliquiddataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DataWellLiquidDto.class, deviceDataDtoList, DeviceExportEnum.WELLLIQUIDDATA_EXPORT.getFileName());
+    }
+
+
+    /**
      * @param keywords
      * @param deptid
      * @param beginTime
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 0b99b60..cd21bad 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,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
@@ -74,6 +75,8 @@
 
     List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<DataWellLiquidDto>  getWellliquiddataList(@Param("dataScope") DataScope dataScope, @Param("page") Page<DataWellLiquidDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
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 c586d01..63decc1 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
@@ -338,6 +338,57 @@
         ORDER BY UPTIME DESC
     </select>
 
+    <select id="getWellliquiddataList"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DataWellLiquidDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT bd.devcode,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.LOGTIME"/>
+        </include>
+        AS "logtime",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.UPTIME"/>
+        </include>
+        AS "uptime",
+        status AS status,
+        bd.device_Type  as "deviceType",
+        cell,
+        descn,
+        deptid,
+        bwi.well_code as "wellCode",
+        type_name as "deviceTypeName"
+        FROM data_well_liquid  dwl
+        JOIN bus_device  bd  ON bd.DEVCODE=dwl.DEVCODE
+        JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        where bd.valid='1' AND  bwi.valid='1'
+        <where>
+            <if test="deptid != null and deptid != -1 ">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </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="selectGasLiquidDataLiquidScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
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 9265caa..f53d8fd 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
@@ -76,6 +76,8 @@
      * @return
      */
     List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, 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
index 0d199fc..8236dc7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -12,7 +12,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
-import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +82,66 @@
     }
 
     /**
+     * 井盖液位一体化列表
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/list-page")
+    @Permission
+    public Object wellliquiddataListPage(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖液位一体化导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/export")
+    @Permission
+    public void wellliquiddataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DataWellLiquidDto.class, deviceDataDtoList, DeviceExportEnum.WELLLIQUIDDATA_EXPORT.getFileName());
+    }
+
+
+    /**
      * @param keywords
      * @param deptid
      * @param beginTime
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 0b99b60..cd21bad 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,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
@@ -74,6 +75,8 @@
 
     List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<DataWellLiquidDto>  getWellliquiddataList(@Param("dataScope") DataScope dataScope, @Param("page") Page<DataWellLiquidDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
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 c586d01..63decc1 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
@@ -338,6 +338,57 @@
         ORDER BY UPTIME DESC
     </select>
 
+    <select id="getWellliquiddataList"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DataWellLiquidDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT bd.devcode,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.LOGTIME"/>
+        </include>
+        AS "logtime",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.UPTIME"/>
+        </include>
+        AS "uptime",
+        status AS status,
+        bd.device_Type  as "deviceType",
+        cell,
+        descn,
+        deptid,
+        bwi.well_code as "wellCode",
+        type_name as "deviceTypeName"
+        FROM data_well_liquid  dwl
+        JOIN bus_device  bd  ON bd.DEVCODE=dwl.DEVCODE
+        JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        where bd.valid='1' AND  bwi.valid='1'
+        <where>
+            <if test="deptid != null and deptid != -1 ">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </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="selectGasLiquidDataLiquidScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
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 9265caa..f53d8fd 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
@@ -76,6 +76,8 @@
      * @return
      */
     List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
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 ad74c38..33de497 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
@@ -494,6 +494,11 @@
     }
 
     @Override
+    public  List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords){
+        return this.baseMapper.getWellliquiddataList(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
+    }
+
+    @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 0d199fc..8236dc7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -12,7 +12,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
-import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +82,66 @@
     }
 
     /**
+     * 井盖液位一体化列表
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/list-page")
+    @Permission
+    public Object wellliquiddataListPage(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖液位一体化导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/export")
+    @Permission
+    public void wellliquiddataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DataWellLiquidDto.class, deviceDataDtoList, DeviceExportEnum.WELLLIQUIDDATA_EXPORT.getFileName());
+    }
+
+
+    /**
      * @param keywords
      * @param deptid
      * @param beginTime
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 0b99b60..cd21bad 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,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
@@ -74,6 +75,8 @@
 
     List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<DataWellLiquidDto>  getWellliquiddataList(@Param("dataScope") DataScope dataScope, @Param("page") Page<DataWellLiquidDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
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 c586d01..63decc1 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
@@ -338,6 +338,57 @@
         ORDER BY UPTIME DESC
     </select>
 
+    <select id="getWellliquiddataList"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DataWellLiquidDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT bd.devcode,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.LOGTIME"/>
+        </include>
+        AS "logtime",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.UPTIME"/>
+        </include>
+        AS "uptime",
+        status AS status,
+        bd.device_Type  as "deviceType",
+        cell,
+        descn,
+        deptid,
+        bwi.well_code as "wellCode",
+        type_name as "deviceTypeName"
+        FROM data_well_liquid  dwl
+        JOIN bus_device  bd  ON bd.DEVCODE=dwl.DEVCODE
+        JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        where bd.valid='1' AND  bwi.valid='1'
+        <where>
+            <if test="deptid != null and deptid != -1 ">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </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="selectGasLiquidDataLiquidScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
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 9265caa..f53d8fd 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
@@ -76,6 +76,8 @@
      * @return
      */
     List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
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 ad74c38..33de497 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
@@ -494,6 +494,11 @@
     }
 
     @Override
+    public  List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords){
+        return this.baseMapper.getWellliquiddataList(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
+    }
+
+    @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 06bcc50..c1a875e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -82,5 +82,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
+//    @ExcelProperty("浮子电线长度")
+    private String lineLength;
 
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 0d199fc..8236dc7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -12,7 +12,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
-import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +82,66 @@
     }
 
     /**
+     * 井盖液位一体化列表
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/list-page")
+    @Permission
+    public Object wellliquiddataListPage(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖液位一体化导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/export")
+    @Permission
+    public void wellliquiddataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DataWellLiquidDto.class, deviceDataDtoList, DeviceExportEnum.WELLLIQUIDDATA_EXPORT.getFileName());
+    }
+
+
+    /**
      * @param keywords
      * @param deptid
      * @param beginTime
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 0b99b60..cd21bad 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,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
@@ -74,6 +75,8 @@
 
     List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<DataWellLiquidDto>  getWellliquiddataList(@Param("dataScope") DataScope dataScope, @Param("page") Page<DataWellLiquidDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
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 c586d01..63decc1 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
@@ -338,6 +338,57 @@
         ORDER BY UPTIME DESC
     </select>
 
+    <select id="getWellliquiddataList"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DataWellLiquidDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT bd.devcode,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.LOGTIME"/>
+        </include>
+        AS "logtime",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.UPTIME"/>
+        </include>
+        AS "uptime",
+        status AS status,
+        bd.device_Type  as "deviceType",
+        cell,
+        descn,
+        deptid,
+        bwi.well_code as "wellCode",
+        type_name as "deviceTypeName"
+        FROM data_well_liquid  dwl
+        JOIN bus_device  bd  ON bd.DEVCODE=dwl.DEVCODE
+        JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        where bd.valid='1' AND  bwi.valid='1'
+        <where>
+            <if test="deptid != null and deptid != -1 ">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </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="selectGasLiquidDataLiquidScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
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 9265caa..f53d8fd 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
@@ -76,6 +76,8 @@
      * @return
      */
     List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
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 ad74c38..33de497 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
@@ -494,6 +494,11 @@
     }
 
     @Override
+    public  List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords){
+        return this.baseMapper.getWellliquiddataList(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
+    }
+
+    @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 06bcc50..c1a875e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -82,5 +82,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
+//    @ExcelProperty("浮子电线长度")
+    private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java
new file mode 100644
index 0000000..86caaaf
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataWellLiquidDto {
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private String deptid;
+    private String deviceType;
+    @ExcelProperty("设备类型")
+    private String deviceTypeName;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    //0心跳、1井盖报警、2液位报警
+    @ExcelProperty("状态")
+    private String status;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    private String logtime;
+}

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 0d199fc..8236dc7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -12,7 +12,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
-import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +82,66 @@
     }
 
     /**
+     * 井盖液位一体化列表
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/list-page")
+    @Permission
+    public Object wellliquiddataListPage(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖液位一体化导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/export")
+    @Permission
+    public void wellliquiddataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DataWellLiquidDto.class, deviceDataDtoList, DeviceExportEnum.WELLLIQUIDDATA_EXPORT.getFileName());
+    }
+
+
+    /**
      * @param keywords
      * @param deptid
      * @param beginTime
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 0b99b60..cd21bad 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,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
@@ -74,6 +75,8 @@
 
     List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<DataWellLiquidDto>  getWellliquiddataList(@Param("dataScope") DataScope dataScope, @Param("page") Page<DataWellLiquidDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
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 c586d01..63decc1 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
@@ -338,6 +338,57 @@
         ORDER BY UPTIME DESC
     </select>
 
+    <select id="getWellliquiddataList"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DataWellLiquidDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT bd.devcode,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.LOGTIME"/>
+        </include>
+        AS "logtime",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.UPTIME"/>
+        </include>
+        AS "uptime",
+        status AS status,
+        bd.device_Type  as "deviceType",
+        cell,
+        descn,
+        deptid,
+        bwi.well_code as "wellCode",
+        type_name as "deviceTypeName"
+        FROM data_well_liquid  dwl
+        JOIN bus_device  bd  ON bd.DEVCODE=dwl.DEVCODE
+        JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        where bd.valid='1' AND  bwi.valid='1'
+        <where>
+            <if test="deptid != null and deptid != -1 ">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </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="selectGasLiquidDataLiquidScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
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 9265caa..f53d8fd 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
@@ -76,6 +76,8 @@
      * @return
      */
     List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
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 ad74c38..33de497 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
@@ -494,6 +494,11 @@
     }
 
     @Override
+    public  List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords){
+        return this.baseMapper.getWellliquiddataList(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
+    }
+
+    @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 06bcc50..c1a875e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -82,5 +82,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
+//    @ExcelProperty("浮子电线长度")
+    private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java
new file mode 100644
index 0000000..86caaaf
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataWellLiquidDto {
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private String deptid;
+    private String deviceType;
+    @ExcelProperty("设备类型")
+    private String deviceTypeName;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    //0心跳、1井盖报警、2液位报警
+    @ExcelProperty("状态")
+    private String status;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
index eb93ee6..eecf5be 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
@@ -30,12 +30,12 @@
     @ExcelProperty("点位编号")
     private String wellCode;
     private String descn;
-    @ExcelProperty("采集时间")
-    private String uptime;
     @ExcelProperty("电量（%）")
     private String cell;
     @ExcelProperty("液位值（m）")
     private String liquiddata;
+    @ExcelProperty("采集时间")
+    private String uptime;
     @ExcelProperty("记录时间")
     private String logtime;
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 0d199fc..8236dc7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -12,7 +12,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
-import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +82,66 @@
     }
 
     /**
+     * 井盖液位一体化列表
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/list-page")
+    @Permission
+    public Object wellliquiddataListPage(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖液位一体化导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/export")
+    @Permission
+    public void wellliquiddataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DataWellLiquidDto.class, deviceDataDtoList, DeviceExportEnum.WELLLIQUIDDATA_EXPORT.getFileName());
+    }
+
+
+    /**
      * @param keywords
      * @param deptid
      * @param beginTime
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 0b99b60..cd21bad 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,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
@@ -74,6 +75,8 @@
 
     List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<DataWellLiquidDto>  getWellliquiddataList(@Param("dataScope") DataScope dataScope, @Param("page") Page<DataWellLiquidDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
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 c586d01..63decc1 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
@@ -338,6 +338,57 @@
         ORDER BY UPTIME DESC
     </select>
 
+    <select id="getWellliquiddataList"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DataWellLiquidDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT bd.devcode,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.LOGTIME"/>
+        </include>
+        AS "logtime",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.UPTIME"/>
+        </include>
+        AS "uptime",
+        status AS status,
+        bd.device_Type  as "deviceType",
+        cell,
+        descn,
+        deptid,
+        bwi.well_code as "wellCode",
+        type_name as "deviceTypeName"
+        FROM data_well_liquid  dwl
+        JOIN bus_device  bd  ON bd.DEVCODE=dwl.DEVCODE
+        JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        where bd.valid='1' AND  bwi.valid='1'
+        <where>
+            <if test="deptid != null and deptid != -1 ">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </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="selectGasLiquidDataLiquidScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
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 9265caa..f53d8fd 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
@@ -76,6 +76,8 @@
      * @return
      */
     List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
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 ad74c38..33de497 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
@@ -494,6 +494,11 @@
     }
 
     @Override
+    public  List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords){
+        return this.baseMapper.getWellliquiddataList(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
+    }
+
+    @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 06bcc50..c1a875e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -82,5 +82,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
+//    @ExcelProperty("浮子电线长度")
+    private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java
new file mode 100644
index 0000000..86caaaf
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataWellLiquidDto {
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private String deptid;
+    private String deviceType;
+    @ExcelProperty("设备类型")
+    private String deviceTypeName;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    //0心跳、1井盖报警、2液位报警
+    @ExcelProperty("状态")
+    private String status;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
index eb93ee6..eecf5be 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
@@ -30,12 +30,12 @@
     @ExcelProperty("点位编号")
     private String wellCode;
     private String descn;
-    @ExcelProperty("采集时间")
-    private String uptime;
     @ExcelProperty("电量（%）")
     private String cell;
     @ExcelProperty("液位值（m）")
     private String liquiddata;
+    @ExcelProperty("采集时间")
+    private String uptime;
     @ExcelProperty("记录时间")
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index df02eed..5aeebdf 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -19,6 +19,7 @@
     BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
     DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
     LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据"),
+    WELLLIQUIDDATA_EXPORT("wellLiquidData.xlsx", "wellLiquidData.xlsx", "井盖液位一体化数据"),
     ALARMJOB_EXPORT("alarmJobData.xlsx", "alarmJobData.xlsx", "预警工单"),
     ALARMRECORD_EXPORT("alarmRecordData.xlsx", "alarmRecordData.xlsx", "预警工单"),
     METHANE_EXPORT("methaneData.xlsx", "methaneData.xlsx", "甲烷数据"),

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 0d199fc..8236dc7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -12,7 +12,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
-import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +82,66 @@
     }
 
     /**
+     * 井盖液位一体化列表
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/list-page")
+    @Permission
+    public Object wellliquiddataListPage(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖液位一体化导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/export")
+    @Permission
+    public void wellliquiddataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DataWellLiquidDto.class, deviceDataDtoList, DeviceExportEnum.WELLLIQUIDDATA_EXPORT.getFileName());
+    }
+
+
+    /**
      * @param keywords
      * @param deptid
      * @param beginTime
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 0b99b60..cd21bad 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,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
@@ -74,6 +75,8 @@
 
     List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<DataWellLiquidDto>  getWellliquiddataList(@Param("dataScope") DataScope dataScope, @Param("page") Page<DataWellLiquidDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
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 c586d01..63decc1 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
@@ -338,6 +338,57 @@
         ORDER BY UPTIME DESC
     </select>
 
+    <select id="getWellliquiddataList"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DataWellLiquidDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT bd.devcode,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.LOGTIME"/>
+        </include>
+        AS "logtime",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.UPTIME"/>
+        </include>
+        AS "uptime",
+        status AS status,
+        bd.device_Type  as "deviceType",
+        cell,
+        descn,
+        deptid,
+        bwi.well_code as "wellCode",
+        type_name as "deviceTypeName"
+        FROM data_well_liquid  dwl
+        JOIN bus_device  bd  ON bd.DEVCODE=dwl.DEVCODE
+        JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        where bd.valid='1' AND  bwi.valid='1'
+        <where>
+            <if test="deptid != null and deptid != -1 ">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </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="selectGasLiquidDataLiquidScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
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 9265caa..f53d8fd 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
@@ -76,6 +76,8 @@
      * @return
      */
     List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
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 ad74c38..33de497 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
@@ -494,6 +494,11 @@
     }
 
     @Override
+    public  List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords){
+        return this.baseMapper.getWellliquiddataList(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
+    }
+
+    @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 06bcc50..c1a875e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -82,5 +82,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
+//    @ExcelProperty("浮子电线长度")
+    private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java
new file mode 100644
index 0000000..86caaaf
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataWellLiquidDto {
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private String deptid;
+    private String deviceType;
+    @ExcelProperty("设备类型")
+    private String deviceTypeName;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    //0心跳、1井盖报警、2液位报警
+    @ExcelProperty("状态")
+    private String status;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
index eb93ee6..eecf5be 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
@@ -30,12 +30,12 @@
     @ExcelProperty("点位编号")
     private String wellCode;
     private String descn;
-    @ExcelProperty("采集时间")
-    private String uptime;
     @ExcelProperty("电量（%）")
     private String cell;
     @ExcelProperty("液位值（m）")
     private String liquiddata;
+    @ExcelProperty("采集时间")
+    private String uptime;
     @ExcelProperty("记录时间")
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index df02eed..5aeebdf 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -19,6 +19,7 @@
     BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
     DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
     LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据"),
+    WELLLIQUIDDATA_EXPORT("wellLiquidData.xlsx", "wellLiquidData.xlsx", "井盖液位一体化数据"),
     ALARMJOB_EXPORT("alarmJobData.xlsx", "alarmJobData.xlsx", "预警工单"),
     ALARMRECORD_EXPORT("alarmRecordData.xlsx", "alarmRecordData.xlsx", "预警工单"),
     METHANE_EXPORT("methaneData.xlsx", "methaneData.xlsx", "甲烷数据"),
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index a669e3d..d8719ab 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -49,7 +49,7 @@
      * 设备编号
      */
     @ExcelProperty("设备编号")
-    @Pattern(regexp = "[A-Za-z0-9]{7,20}",message = "设备编号必须为7-20位字母或数字组合")
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
     @TableField("DEVCODE")
     private String devcode;
     /**
@@ -110,12 +110,15 @@
     @ExcelProperty("数据集中器编号")
     @TableField(exist = false)
     private String concenCode;
+
+    @ExcelProperty("浮子电线长度")
+    private Double lineLength;
+
+    @TableField(exist = false)
+    private Long concenId;
     //闸井ID
     @TableField(exist = false)
     private Long wellId;
-    //集中器ID
-    @TableField(exist = false)
-    private Long concenId;
 
     @TableField(exist = false)
     private String installDateFmt;

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 0d199fc..8236dc7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -12,7 +12,6 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.AlarmDeptStaticsDto;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
-import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.DeviceExportEnum;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
@@ -83,6 +82,66 @@
     }
 
     /**
+     * 井盖液位一体化列表
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/list-page")
+    @Permission
+    public Object wellliquiddataListPage(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        page.setRecords(deviceDataDtoList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    /**
+     * 井盖液位一体化导出
+     *
+     * @param response
+     * @param keywords
+     * @param deptid
+     * @param beginTime
+     * @param endTime
+     * @throws IOException
+     */
+    @GetMapping(value = "/wellliquiddata/export")
+    @Permission
+    public void wellliquiddataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataWellLiquidDto> 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<DataWellLiquidDto> deviceDataDtoList = deviceService.getWellliquiddataList(dataScope, page, deptid, beginTime, endTime, keywords);
+        deviceDataDtoList.forEach(deviceDto -> {
+            deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
+        });
+        super.exportExcel(DataWellLiquidDto.class, deviceDataDtoList, DeviceExportEnum.WELLLIQUIDDATA_EXPORT.getFileName());
+    }
+
+
+    /**
      * @param keywords
      * @param deptid
      * @param beginTime
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 0b99b60..cd21bad 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,5 +1,6 @@
 package com.casic.missiles.modular.system.dao;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.datascope.DataScope;
@@ -74,6 +75,8 @@
 
     List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<DataWellLiquidDto>  getWellliquiddataList(@Param("dataScope") DataScope dataScope, @Param("page") Page<DataWellLiquidDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
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 c586d01..63decc1 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
@@ -338,6 +338,57 @@
         ORDER BY UPTIME DESC
     </select>
 
+    <select id="getWellliquiddataList"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DataWellLiquidDto"
+            parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
+        SELECT bd.devcode,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.LOGTIME"/>
+        </include>
+        AS "logtime",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dwl.UPTIME"/>
+        </include>
+        AS "uptime",
+        status AS status,
+        bd.device_Type  as "deviceType",
+        cell,
+        descn,
+        deptid,
+        bwi.well_code as "wellCode",
+        type_name as "deviceTypeName"
+        FROM data_well_liquid  dwl
+        JOIN bus_device  bd  ON bd.DEVCODE=dwl.DEVCODE
+        JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        where bd.valid='1' AND  bwi.valid='1'
+        <where>
+            <if test="deptid != null and deptid != -1 ">
+                and deptid = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dwl.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dwl.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </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="selectGasLiquidDataLiquidScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
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 9265caa..f53d8fd 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
@@ -76,6 +76,8 @@
      * @return
      */
     List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
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 ad74c38..33de497 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
@@ -494,6 +494,11 @@
     }
 
     @Override
+    public  List<DataWellLiquidDto> getWellliquiddataList(DataScope dataScope, Page<DataWellLiquidDto> page, String deptid, String beginTime, String endTime, String keywords){
+        return this.baseMapper.getWellliquiddataList(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
+    }
+
+    @Override
     public List<DeviceDataExcelDto> selectGasDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         List<DeviceDataExcelDto> deviceDataExcelDtoList = this.baseMapper.selectGasDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
         return deviceDataExcelDtoList;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 06bcc50..c1a875e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -82,5 +82,7 @@
     private String wellId;
     @ExcelProperty("设备安装高度")
     private String installHeight;
+//    @ExcelProperty("浮子电线长度")
+    private String lineLength;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java
new file mode 100644
index 0000000..86caaaf
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DataWellLiquidDto.java
@@ -0,0 +1,44 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class DataWellLiquidDto {
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private String deptid;
+    private String deviceType;
+    @ExcelProperty("设备类型")
+    private String deviceTypeName;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("电量（%）")
+    private String cell;
+    //0心跳、1井盖报警、2液位报警
+    @ExcelProperty("状态")
+    private String status;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
index eb93ee6..eecf5be 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
@@ -30,12 +30,12 @@
     @ExcelProperty("点位编号")
     private String wellCode;
     private String descn;
-    @ExcelProperty("采集时间")
-    private String uptime;
     @ExcelProperty("电量（%）")
     private String cell;
     @ExcelProperty("液位值（m）")
     private String liquiddata;
+    @ExcelProperty("采集时间")
+    private String uptime;
     @ExcelProperty("记录时间")
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index df02eed..5aeebdf 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -19,6 +19,7 @@
     BUSCONCENTRATOR_EXPORT("busConcentrator.xlsx", "busConcentrator.xlsx", "集中器数据"),
     DEVICE_EXPORT("device.xlsx", "device.xlsx", "设备数据"),
     LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据"),
+    WELLLIQUIDDATA_EXPORT("wellLiquidData.xlsx", "wellLiquidData.xlsx", "井盖液位一体化数据"),
     ALARMJOB_EXPORT("alarmJobData.xlsx", "alarmJobData.xlsx", "预警工单"),
     ALARMRECORD_EXPORT("alarmRecordData.xlsx", "alarmRecordData.xlsx", "预警工单"),
     METHANE_EXPORT("methaneData.xlsx", "methaneData.xlsx", "甲烷数据"),
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
index a669e3d..d8719ab 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Device.java
@@ -49,7 +49,7 @@
      * 设备编号
      */
     @ExcelProperty("设备编号")
-    @Pattern(regexp = "[A-Za-z0-9]{7,20}",message = "设备编号必须为7-20位字母或数字组合")
+    @Pattern(regexp = "[A-Za-z0-9]{7,20}", message = "设备编号必须为7-20位字母或数字组合")
     @TableField("DEVCODE")
     private String devcode;
     /**
@@ -110,12 +110,15 @@
     @ExcelProperty("数据集中器编号")
     @TableField(exist = false)
     private String concenCode;
+
+    @ExcelProperty("浮子电线长度")
+    private Double lineLength;
+
+    @TableField(exist = false)
+    private Long concenId;
     //闸井ID
     @TableField(exist = false)
     private Long wellId;
-    //集中器ID
-    @TableField(exist = false)
-    private Long concenId;
 
     @TableField(exist = false)
     private String installDateFmt;
diff --git a/casic-web/src/main/java/com/casic/missiles/config/WebMvcConfig.java b/casic-web/src/main/java/com/casic/missiles/config/WebMvcConfig.java
new file mode 100644
index 0000000..9a96d67
--- /dev/null
+++ b/casic-web/src/main/java/com/casic/missiles/config/WebMvcConfig.java
@@ -0,0 +1,21 @@
+package com.casic.missiles.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+
+@Configuration
+class WebMvcConfig extends WebMvcConfigurationSupport {
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+        registry.addResourceHandler("swagger-ui.html").addResourceLocations(
+                "classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations(
+                "classpath:/META-INF/resources/webjars/");
+        registry.addResourceHandler("doc.html").addResourceLocations(
+                "classpath:/META-INF/resources/");
+        super.addResourceHandlers(registry);
+    }
+
+}
\ No newline at end of file