diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 14b9719..1e7abd0 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,6 +12,7 @@
 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;
@@ -618,4 +619,26 @@
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
     }
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list-page")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 硫化氢栓导出
+     */
+    @GetMapping(value = "/h2s/export")
+    public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 14b9719..1e7abd0 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,6 +12,7 @@
 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;
@@ -618,4 +619,26 @@
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
     }
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list-page")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 硫化氢栓导出
+     */
+    @GetMapping(value = "/h2s/export")
+    public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 4335e9c..ab62e2e 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
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,4 +96,7 @@
 
     List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<DataH2s>  page, @Param("deptid") String 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/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 14b9719..1e7abd0 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,6 +12,7 @@
 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;
@@ -618,4 +619,26 @@
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
     }
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list-page")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 硫化氢栓导出
+     */
+    @GetMapping(value = "/h2s/export")
+    public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 4335e9c..ab62e2e 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
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,4 +96,7 @@
 
     List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<DataH2s>  page, @Param("deptid") String 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/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 12ce114..7114492 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -42,4 +42,6 @@
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DataHydrant> getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String 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/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 14b9719..1e7abd0 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,6 +12,7 @@
 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;
@@ -618,4 +619,26 @@
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
     }
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list-page")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 硫化氢栓导出
+     */
+    @GetMapping(value = "/h2s/export")
+    public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 4335e9c..ab62e2e 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
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,4 +96,7 @@
 
     List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<DataH2s>  page, @Param("deptid") String 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/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 12ce114..7114492 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -42,4 +42,6 @@
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DataHydrant> getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String 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 3245bcb..c72050e 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
@@ -1290,4 +1290,46 @@
         </if>
     </select>
 
+
+    <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
+
 </mapper>

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 14b9719..1e7abd0 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,6 +12,7 @@
 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;
@@ -618,4 +619,26 @@
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
     }
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list-page")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 硫化氢栓导出
+     */
+    @GetMapping(value = "/h2s/export")
+    public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 4335e9c..ab62e2e 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
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,4 +96,7 @@
 
     List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<DataH2s>  page, @Param("deptid") String 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/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 12ce114..7114492 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -42,4 +42,6 @@
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DataHydrant> getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String 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 3245bcb..c72050e 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
@@ -1290,4 +1290,46 @@
         </if>
     </select>
 
+
+    <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 6e2e8fd..adc10af 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -669,4 +669,46 @@
             </if>
         </where>
     </select>
+
+    <select id="selectH2sListDataScope" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
 </mapper>

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 14b9719..1e7abd0 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,6 +12,7 @@
 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;
@@ -618,4 +619,26 @@
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
     }
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list-page")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 硫化氢栓导出
+     */
+    @GetMapping(value = "/h2s/export")
+    public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 4335e9c..ab62e2e 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
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,4 +96,7 @@
 
     List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<DataH2s>  page, @Param("deptid") String 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/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 12ce114..7114492 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -42,4 +42,6 @@
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DataHydrant> getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String 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 3245bcb..c72050e 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
@@ -1290,4 +1290,46 @@
         </if>
     </select>
 
+
+    <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 6e2e8fd..adc10af 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -669,4 +669,46 @@
             </if>
         </where>
     </select>
+
+    <select id="selectH2sListDataScope" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 99d1ca1..698a8ea 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -59,4 +59,6 @@
 
     List<DataHydrant> getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
 
+    List<DataH2s> getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
 }
\ No newline at end of file

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 14b9719..1e7abd0 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,6 +12,7 @@
 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;
@@ -618,4 +619,26 @@
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
     }
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list-page")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 硫化氢栓导出
+     */
+    @GetMapping(value = "/h2s/export")
+    public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 4335e9c..ab62e2e 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
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,4 +96,7 @@
 
     List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<DataH2s>  page, @Param("deptid") String 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/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 12ce114..7114492 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -42,4 +42,6 @@
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DataHydrant> getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String 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 3245bcb..c72050e 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
@@ -1290,4 +1290,46 @@
         </if>
     </select>
 
+
+    <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 6e2e8fd..adc10af 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -669,4 +669,46 @@
             </if>
         </where>
     </select>
+
+    <select id="selectH2sListDataScope" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 99d1ca1..698a8ea 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -59,4 +59,6 @@
 
     List<DataHydrant> getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
 
+    List<DataH2s> getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
 }
\ No newline at end of file
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 931432e..d09c12e 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
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -124,4 +125,6 @@
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
     ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    ResponseData getH2slist(DataScope dataScope, Page<DataH2s> page, String deptid, String beginTime, String endTime, String keywords);
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 14b9719..1e7abd0 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,6 +12,7 @@
 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;
@@ -618,4 +619,26 @@
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
     }
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list-page")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 硫化氢栓导出
+     */
+    @GetMapping(value = "/h2s/export")
+    public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 4335e9c..ab62e2e 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
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,4 +96,7 @@
 
     List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<DataH2s>  page, @Param("deptid") String 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/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 12ce114..7114492 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -42,4 +42,6 @@
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DataHydrant> getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String 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 3245bcb..c72050e 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
@@ -1290,4 +1290,46 @@
         </if>
     </select>
 
+
+    <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 6e2e8fd..adc10af 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -669,4 +669,46 @@
             </if>
         </where>
     </select>
+
+    <select id="selectH2sListDataScope" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 99d1ca1..698a8ea 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -59,4 +59,6 @@
 
     List<DataHydrant> getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
 
+    List<DataH2s> getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
 }
\ No newline at end of file
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 931432e..d09c12e 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
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -124,4 +125,6 @@
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
     ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    ResponseData getH2slist(DataScope dataScope, Page<DataH2s> 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/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
index 3d758d2..95baa10 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
@@ -104,8 +104,14 @@
         return mapList;
     }
 
+    @Override
     public List<DataHydrant> getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
         List<DataHydrant> mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return mapList;
     }
+
+    @Override
+    public List<DataH2s> getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+        return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, keywords);
+    }
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 14b9719..1e7abd0 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,6 +12,7 @@
 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;
@@ -618,4 +619,26 @@
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
     }
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list-page")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 硫化氢栓导出
+     */
+    @GetMapping(value = "/h2s/export")
+    public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 4335e9c..ab62e2e 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
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,4 +96,7 @@
 
     List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<DataH2s>  page, @Param("deptid") String 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/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 12ce114..7114492 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -42,4 +42,6 @@
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DataHydrant> getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String 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 3245bcb..c72050e 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
@@ -1290,4 +1290,46 @@
         </if>
     </select>
 
+
+    <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 6e2e8fd..adc10af 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -669,4 +669,46 @@
             </if>
         </where>
     </select>
+
+    <select id="selectH2sListDataScope" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 99d1ca1..698a8ea 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -59,4 +59,6 @@
 
     List<DataHydrant> getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
 
+    List<DataH2s> getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
 }
\ No newline at end of file
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 931432e..d09c12e 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
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -124,4 +125,6 @@
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
     ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    ResponseData getH2slist(DataScope dataScope, Page<DataH2s> 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/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
index 3d758d2..95baa10 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
@@ -104,8 +104,14 @@
         return mapList;
     }
 
+    @Override
     public List<DataHydrant> getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
         List<DataHydrant> mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return mapList;
     }
+
+    @Override
+    public List<DataH2s> getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+        return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, 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 481335a..9ae5886 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
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enums.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -557,4 +558,21 @@
         }
         return responseData;
     }
+
+    public ResponseData getH2slist(DataScope dataScope, Page<DataH2s> page, String deptid, String beginTime, String endTime, String keywords) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DataH2s> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+            page.setRecords(h2sDataDtoList);
+            responseData.setData(page);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException dex) {
+            log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息",
+                    keywords, beginTime, endTime, deptid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库查询异常");
+        }
+        return responseData;
+    }
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 14b9719..1e7abd0 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,6 +12,7 @@
 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;
@@ -618,4 +619,26 @@
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
     }
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list-page")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 硫化氢栓导出
+     */
+    @GetMapping(value = "/h2s/export")
+    public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 4335e9c..ab62e2e 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
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,4 +96,7 @@
 
     List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<DataH2s>  page, @Param("deptid") String 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/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 12ce114..7114492 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -42,4 +42,6 @@
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DataHydrant> getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String 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 3245bcb..c72050e 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
@@ -1290,4 +1290,46 @@
         </if>
     </select>
 
+
+    <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 6e2e8fd..adc10af 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -669,4 +669,46 @@
             </if>
         </where>
     </select>
+
+    <select id="selectH2sListDataScope" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 99d1ca1..698a8ea 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -59,4 +59,6 @@
 
     List<DataHydrant> getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
 
+    List<DataH2s> getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
 }
\ No newline at end of file
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 931432e..d09c12e 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
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -124,4 +125,6 @@
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
     ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    ResponseData getH2slist(DataScope dataScope, Page<DataH2s> 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/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
index 3d758d2..95baa10 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
@@ -104,8 +104,14 @@
         return mapList;
     }
 
+    @Override
     public List<DataHydrant> getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
         List<DataHydrant> mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return mapList;
     }
+
+    @Override
+    public List<DataH2s> getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+        return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, 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 481335a..9ae5886 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
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enums.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -557,4 +558,21 @@
         }
         return responseData;
     }
+
+    public ResponseData getH2slist(DataScope dataScope, Page<DataH2s> page, String deptid, String beginTime, String endTime, String keywords) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DataH2s> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+            page.setRecords(h2sDataDtoList);
+            responseData.setData(page);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException dex) {
+            log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息",
+                    keywords, beginTime, endTime, deptid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
new file mode 100644
index 0000000..b7ce91a
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+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
+@NoArgsConstructor
+public class DataH2s {
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("点位编号")
+    private String wellCode;
+
+    @ExcelProperty("设备类型")
+    private String deviceType;
+
+    @ExcelProperty("硫化氢浓度")
+    private String strength;
+
+    @ExcelProperty("电量")
+    private String cell;
+
+    @ExcelProperty("上传时间")
+    private String uptime;
+
+    @ExcelProperty("权属部门")
+    private String deptid;
+
+}

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index ff88c26..09d3c0d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
@@ -120,11 +120,23 @@
      * 消防栓列表
      */
     @GetMapping(value = "/hydrant/list")
-    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+    public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) {
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DataHydrant> mapList=  deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return ResponseData.success(mapList);
     }
 
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        System.out.println(keywords);
+        List<DataH2s> mapList=  deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords);
+        return ResponseData.success(mapList);
+    }
+
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 14b9719..1e7abd0 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,6 +12,7 @@
 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;
@@ -618,4 +619,26 @@
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
     }
 
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/h2s/list-page")
+    public Object h2sList(String keywords, String deptid, String beginTime, String endTime) {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 硫化氢栓导出
+     */
+    @GetMapping(value = "/h2s/export")
+    public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<DataH2s> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 4335e9c..ab62e2e 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
@@ -5,6 +5,7 @@
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -95,4 +96,7 @@
 
     List<HydrantDataDto> getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page<HydrantDataDto>  page, @Param("deptid") String deptid,
                                         @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page<DataH2s>  page, @Param("deptid") String 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/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 12ce114..7114492 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -42,4 +42,6 @@
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DataHydrant> getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
+    List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String 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 3245bcb..c72050e 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
@@ -1290,4 +1290,46 @@
         </if>
     </select>
 
+
+    <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 6e2e8fd..adc10af 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -669,4 +669,46 @@
             </if>
         </where>
     </select>
+
+    <select id="selectH2sListDataScope" resultType="com.casic.missiles.modular.system.dto.statistic.DataH2s">
+        SELECT
+        dh2s.DEVCODE AS devcode,
+        dh2s.WELL_CODE AS "wellCode",
+        dh2s.STRENGTH,
+        dh2s.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh2s.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        dh2s.device_type as deviceType
+        FROM data_h2s dh2s
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE
+        JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dh2s.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dh2s.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dh2s.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 99d1ca1..698a8ea 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
@@ -59,4 +59,6 @@
 
     List<DataHydrant> getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
 
+    List<DataH2s> getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords);
+
 }
\ No newline at end of file
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 931432e..d09c12e 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
@@ -6,6 +6,7 @@
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
@@ -124,4 +125,6 @@
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
     ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords);
+
+    ResponseData getH2slist(DataScope dataScope, Page<DataH2s> 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/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
index 3d758d2..95baa10 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
@@ -104,8 +104,14 @@
         return mapList;
     }
 
+    @Override
     public List<DataHydrant> getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
         List<DataHydrant> mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords);
         return mapList;
     }
+
+    @Override
+    public List<DataH2s> getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) {
+        return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, 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 481335a..9ae5886 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
@@ -15,6 +15,7 @@
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
+import com.casic.missiles.modular.system.dto.statistic.DataH2s;
 import com.casic.missiles.modular.system.enums.HarmfulGasBusiness;
 import com.casic.missiles.modular.system.enums.TemphumBusiness;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -557,4 +558,21 @@
         }
         return responseData;
     }
+
+    public ResponseData getH2slist(DataScope dataScope, Page<DataH2s> page, String deptid, String beginTime, String endTime, String keywords) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<DataH2s> h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+            page.setRecords(h2sDataDtoList);
+            responseData.setData(page);
+            responseData.setCode(200);
+            responseData.setMessage("查询成功");
+        } catch (DataAccessException dex) {
+            log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息",
+                    keywords, beginTime, endTime, deptid, dex);
+            responseData.setCode(500);
+            responseData.setMessage("数据库查询异常");
+        }
+        return responseData;
+    }
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
new file mode 100644
index 0000000..b7ce91a
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+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
+@NoArgsConstructor
+public class DataH2s {
+    @ExcelProperty("设备编号")
+    private String devcode;
+
+    @ExcelProperty("点位编号")
+    private String wellCode;
+
+    @ExcelProperty("设备类型")
+    private String deviceType;
+
+    @ExcelProperty("硫化氢浓度")
+    private String strength;
+
+    @ExcelProperty("电量")
+    private String cell;
+
+    @ExcelProperty("上传时间")
+    private String uptime;
+
+    @ExcelProperty("权属部门")
+    private String deptid;
+
+}
diff --git a/casic-web/src/main/resources/config/application-prod.yml b/casic-web/src/main/resources/config/application-prod.yml
index 6553b10..09a5f82 100644
--- a/casic-web/src/main/resources/config/application-prod.yml
+++ b/casic-web/src/main/resources/config/application-prod.yml
@@ -1,34 +1,63 @@
 server:
-  port: 8085
-#  context-path: /callcenter/api
+  port: 11309
 ###################  spring配置  ###################
 spring:
+  web:
+    resources:
+      static-locations: file:/casic/smartwell/smartwellProd3/static/,file:/casic/smartwell/smartwellProd3/download/,file:/casic/smartwell/smartwellProd3/image/  # 文件的下载和图片路径，对应static接口
   datasource:
-    url: jdbc:mysql://10.18.0.20:3306/casic_smartcity_callcenter?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://111.198.10.15:11336/smartwell_zq?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
-    initial-size: 2
-    min-idle: 1
+  redis:
+    host: 111.198.10.15
+    port: 11412
+    password: ew5T4K3#203lwh
+    redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
   jms:
     pub-sub-domain: true
   #  session:
   #   store-type: redis
-  redis:
+  redis-config:
     host: 127.0.0.1
     port: 6379
     password:
-
+  activemq:
+    user:
+    password:
+    broker-url: tcp://192.168.0.203:61616
 #flowable数据源和多数据源配置
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
-  nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken
-  flowable:
-    datasource:
-      url: jdbc:mysql://10.18.0.20:3306/callcenter_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
-      username: root
-      password: Casic203
+  #kaptcha-open: false #是否开启登录时验证码 (true/false)
+  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+  db:
+    init:
+      enable: false
+  file:
+    uploadPath: /casic/smartwell/smartwellProd3/static/
+  spring-session-open: false #开启spring session
+smartcity:
+  config:
+    export-path: /casic/smartwell/smartwellProd3/export/
+    image-path: /casic/smartwell/smartwellProd3/static/  #图片下载上传路径
+    config-path: //casic/smartwell/smartwellProd3/temp/   #模板路径，注意linux下要多加一个斜杠
+    download-path: /casic/smartwell/smartwellProd3/download/  #下载路径
+  device:
+    redis:
+      invalid-time: 86400
+      host: 127.0.0.1
+      port: 6379
+      password: ew5T4K3#203lwh
+      config-prefix: 'Casic:'
+  getui:
+    appId: H9jSTE2bAt8QWq2K2GNOB3
+    appKey: bhPeCutJVdAyOasevQFtN9
+    masterSecret: lChudND74A89WRiHLkedb5
 logging:
   level.root: info
   level.com.casic: debug
-  path: logs/
-  file: missiles.log
\ No newline at end of file
+  file:
+    path: logs/
+    name: missiles.log
\ No newline at end of file