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 17e9e98..b3c1db9 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
@@ -561,14 +561,9 @@
         super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
+
     /**
      * 数据列表查询
-     *
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
      */
     @GetMapping(value = "/data/list")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
@@ -580,4 +575,26 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 消防栓导出
+     */
+    @GetMapping(value = "/hydrant/export")
+    public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
+    }
+
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 17e9e98..b3c1db9 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
@@ -561,14 +561,9 @@
         super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
+
     /**
      * 数据列表查询
-     *
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
      */
     @GetMapping(value = "/data/list")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
@@ -580,4 +575,26 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 消防栓导出
+     */
+    @GetMapping(value = "/hydrant/export")
+    public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(HydrantDataDto.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 ed84f3e..4335e9c 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
@@ -92,4 +92,7 @@
     List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    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);
 }

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 17e9e98..b3c1db9 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
@@ -561,14 +561,9 @@
         super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
+
     /**
      * 数据列表查询
-     *
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
      */
     @GetMapping(value = "/data/list")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
@@ -580,4 +575,26 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 消防栓导出
+     */
+    @GetMapping(value = "/hydrant/export")
+    public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(HydrantDataDto.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 ed84f3e..4335e9c 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
@@ -92,4 +92,7 @@
     List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    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);
 }
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 4e30ef8..293a8e4 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
@@ -1253,4 +1253,41 @@
         </where>
         ORDER BY glview.UPTIME DESC
     </select>
+
+    <select id="getHydrantlist" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HydrantDataDto">
+
+        SELECT bd.DEVCODE AS devcode,bd.DEVICE_TYPE AS deviceType,bdt.TYPE_NAME AS
+        "deviceTypeName",bwi.deptid,dh.WELL_CODE AS "wellCode",
+        dh.STATUS AS "status",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh.LOGTIME"/>
+        </include>
+        AS logtime
+        FROM data_hydrant dh
+        JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
+        WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (bd.DEVCODE LIKE
+            <include refid="keywords_sql"/>
+            OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and glview.UPTIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and glview.UPTIME <![CDATA[ <= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+    </select>
+
 </mapper>

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 17e9e98..b3c1db9 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
@@ -561,14 +561,9 @@
         super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
+
     /**
      * 数据列表查询
-     *
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
      */
     @GetMapping(value = "/data/list")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
@@ -580,4 +575,26 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 消防栓导出
+     */
+    @GetMapping(value = "/hydrant/export")
+    public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(HydrantDataDto.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 ed84f3e..4335e9c 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
@@ -92,4 +92,7 @@
     List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    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);
 }
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 4e30ef8..293a8e4 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
@@ -1253,4 +1253,41 @@
         </where>
         ORDER BY glview.UPTIME DESC
     </select>
+
+    <select id="getHydrantlist" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HydrantDataDto">
+
+        SELECT bd.DEVCODE AS devcode,bd.DEVICE_TYPE AS deviceType,bdt.TYPE_NAME AS
+        "deviceTypeName",bwi.deptid,dh.WELL_CODE AS "wellCode",
+        dh.STATUS AS "status",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh.LOGTIME"/>
+        </include>
+        AS logtime
+        FROM data_hydrant dh
+        JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
+        WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (bd.DEVCODE LIKE
+            <include refid="keywords_sql"/>
+            OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and glview.UPTIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and glview.UPTIME <![CDATA[ <= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40f5a52..f551340 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -135,13 +135,13 @@
         JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
-            and UPTIME <![CDATA[ >= ]]>
+            and LOGTIME <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and UPTIME <![CDATA[ <= ]]>
+            and LOGTIME <![CDATA[ <= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{endTime}"/>
             </include>

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 17e9e98..b3c1db9 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
@@ -561,14 +561,9 @@
         super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
+
     /**
      * 数据列表查询
-     *
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
      */
     @GetMapping(value = "/data/list")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
@@ -580,4 +575,26 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 消防栓导出
+     */
+    @GetMapping(value = "/hydrant/export")
+    public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(HydrantDataDto.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 ed84f3e..4335e9c 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
@@ -92,4 +92,7 @@
     List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    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);
 }
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 4e30ef8..293a8e4 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
@@ -1253,4 +1253,41 @@
         </where>
         ORDER BY glview.UPTIME DESC
     </select>
+
+    <select id="getHydrantlist" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HydrantDataDto">
+
+        SELECT bd.DEVCODE AS devcode,bd.DEVICE_TYPE AS deviceType,bdt.TYPE_NAME AS
+        "deviceTypeName",bwi.deptid,dh.WELL_CODE AS "wellCode",
+        dh.STATUS AS "status",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh.LOGTIME"/>
+        </include>
+        AS logtime
+        FROM data_hydrant dh
+        JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
+        WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (bd.DEVCODE LIKE
+            <include refid="keywords_sql"/>
+            OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and glview.UPTIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and glview.UPTIME <![CDATA[ <= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40f5a52..f551340 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -135,13 +135,13 @@
         JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
-            and UPTIME <![CDATA[ >= ]]>
+            and LOGTIME <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and UPTIME <![CDATA[ <= ]]>
+            and LOGTIME <![CDATA[ <= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{endTime}"/>
             </include>
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 17d3579..eabb8f9 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -120,4 +121,6 @@
     List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
+
+    ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 17e9e98..b3c1db9 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
@@ -561,14 +561,9 @@
         super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
+
     /**
      * 数据列表查询
-     *
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
      */
     @GetMapping(value = "/data/list")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
@@ -580,4 +575,26 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 消防栓导出
+     */
+    @GetMapping(value = "/hydrant/export")
+    public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(HydrantDataDto.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 ed84f3e..4335e9c 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
@@ -92,4 +92,7 @@
     List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    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);
 }
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 4e30ef8..293a8e4 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
@@ -1253,4 +1253,41 @@
         </where>
         ORDER BY glview.UPTIME DESC
     </select>
+
+    <select id="getHydrantlist" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HydrantDataDto">
+
+        SELECT bd.DEVCODE AS devcode,bd.DEVICE_TYPE AS deviceType,bdt.TYPE_NAME AS
+        "deviceTypeName",bwi.deptid,dh.WELL_CODE AS "wellCode",
+        dh.STATUS AS "status",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh.LOGTIME"/>
+        </include>
+        AS logtime
+        FROM data_hydrant dh
+        JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
+        WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (bd.DEVCODE LIKE
+            <include refid="keywords_sql"/>
+            OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and glview.UPTIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and glview.UPTIME <![CDATA[ <= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40f5a52..f551340 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -135,13 +135,13 @@
         JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
-            and UPTIME <![CDATA[ >= ]]>
+            and LOGTIME <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and UPTIME <![CDATA[ <= ]]>
+            and LOGTIME <![CDATA[ <= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{endTime}"/>
             </include>
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 17d3579..eabb8f9 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -120,4 +121,6 @@
     List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
+
+    ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index ebb5697..481335a 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -20,6 +21,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -478,7 +480,7 @@
                     deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
 //                    setCompany(map);
                     if ("liquid".equals(sensorType)) {
-                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength());
+                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
                         if (liquiddata <= 0) {
                             deviceDataExcelDto.setStrength("正常水位");
                         }
@@ -522,6 +524,7 @@
 
     /**
      * 查询公司名称、ID
+     *
      * @param dataMap
      */
     private void setCompany(Map<String, Object> dataMap) {
@@ -534,4 +537,24 @@
             }
         }
     }
+
+    public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+            hydrantDataDtoList.forEach(gasDectorDataDto -> {
+                gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
+            });
+            page.setRecords(hydrantDataDtoList);
+            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/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 17e9e98..b3c1db9 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
@@ -561,14 +561,9 @@
         super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
+
     /**
      * 数据列表查询
-     *
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
      */
     @GetMapping(value = "/data/list")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
@@ -580,4 +575,26 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 消防栓导出
+     */
+    @GetMapping(value = "/hydrant/export")
+    public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(HydrantDataDto.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 ed84f3e..4335e9c 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
@@ -92,4 +92,7 @@
     List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    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);
 }
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 4e30ef8..293a8e4 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
@@ -1253,4 +1253,41 @@
         </where>
         ORDER BY glview.UPTIME DESC
     </select>
+
+    <select id="getHydrantlist" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HydrantDataDto">
+
+        SELECT bd.DEVCODE AS devcode,bd.DEVICE_TYPE AS deviceType,bdt.TYPE_NAME AS
+        "deviceTypeName",bwi.deptid,dh.WELL_CODE AS "wellCode",
+        dh.STATUS AS "status",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh.LOGTIME"/>
+        </include>
+        AS logtime
+        FROM data_hydrant dh
+        JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
+        WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (bd.DEVCODE LIKE
+            <include refid="keywords_sql"/>
+            OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and glview.UPTIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and glview.UPTIME <![CDATA[ <= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40f5a52..f551340 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -135,13 +135,13 @@
         JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
-            and UPTIME <![CDATA[ >= ]]>
+            and LOGTIME <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and UPTIME <![CDATA[ <= ]]>
+            and LOGTIME <![CDATA[ <= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{endTime}"/>
             </include>
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 17d3579..eabb8f9 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -120,4 +121,6 @@
     List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
+
+    ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index ebb5697..481335a 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -20,6 +21,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -478,7 +480,7 @@
                     deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
 //                    setCompany(map);
                     if ("liquid".equals(sensorType)) {
-                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength());
+                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
                         if (liquiddata <= 0) {
                             deviceDataExcelDto.setStrength("正常水位");
                         }
@@ -522,6 +524,7 @@
 
     /**
      * 查询公司名称、ID
+     *
      * @param dataMap
      */
     private void setCompany(Map<String, Object> dataMap) {
@@ -534,4 +537,24 @@
             }
         }
     }
+
+    public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+            hydrantDataDtoList.forEach(gasDectorDataDto -> {
+                gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
+            });
+            page.setRecords(hydrantDataDtoList);
+            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/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
new file mode 100644
index 0000000..455c641
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
@@ -0,0 +1,39 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+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;
+
+/**
+ * @author cz
+ * @date 2022-7-16
+ * 有害气体
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@NoArgsConstructor
+public class HydrantDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    @ExcelProperty("状态")
+    private String status;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 17e9e98..b3c1db9 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
@@ -561,14 +561,9 @@
         super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
+
     /**
      * 数据列表查询
-     *
-     * @param wellCode
-     * @param watchType
-     * @param beginTime
-     * @param endTime
-     * @return
      */
     @GetMapping(value = "/data/list")
     public Object dataList(String wellCode, String watchType, String beginTime, String endTime) {
@@ -580,4 +575,26 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/hydrant/list")
+    public Object hydrantlist(String keywords, String deptid, String beginTime, String endTime) {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        ResponseData responseData = deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        responseData.setData(super.packForBT(page));
+        return responseData;
+    }
+    /**
+     * 消防栓导出
+     */
+    @GetMapping(value = "/hydrant/export")
+    public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
+        Page<HydrantDataDto> page = PageFactory.defaultPage();
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+        super.exportExcel(HydrantDataDto.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 ed84f3e..4335e9c 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
@@ -92,4 +92,7 @@
     List<Map<String, Object>> selectTempDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
     List<Map<String, Object>> selectHarmfulDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    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);
 }
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 4e30ef8..293a8e4 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
@@ -1253,4 +1253,41 @@
         </where>
         ORDER BY glview.UPTIME DESC
     </select>
+
+    <select id="getHydrantlist" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HydrantDataDto">
+
+        SELECT bd.DEVCODE AS devcode,bd.DEVICE_TYPE AS deviceType,bdt.TYPE_NAME AS
+        "deviceTypeName",bwi.deptid,dh.WELL_CODE AS "wellCode",
+        dh.STATUS AS "status",
+        <include refid="date_toChar">
+            <property name="paramTime" value="dh.LOGTIME"/>
+        </include>
+        AS logtime
+        FROM data_hydrant dh
+        JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
+        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE
+        JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
+        WHERE 1 = 1
+        <if test="keywords != null and keywords !=''">
+            AND (bd.DEVCODE LIKE
+            <include refid="keywords_sql"/>
+            OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+        </if>
+        <if test="deptid != null and deptid !=''">
+            and w.DEPTID = #{deptid}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and glview.UPTIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and glview.UPTIME <![CDATA[ <= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+    </select>
+
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 40f5a52..f551340 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -135,13 +135,13 @@
         JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
-            and UPTIME <![CDATA[ >= ]]>
+            and LOGTIME <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and UPTIME <![CDATA[ <= ]]>
+            and LOGTIME <![CDATA[ <= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{endTime}"/>
             </include>
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 17d3579..eabb8f9 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
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.*;
 import com.casic.missiles.modular.system.dto.ExcelModel.*;
 import com.casic.missiles.modular.system.model.BusWellInfo;
@@ -120,4 +121,6 @@
     List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
+
+    ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index ebb5697..481335a 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.dao.DataAnalysisMapper;
 import com.casic.missiles.modular.system.dto.*;
@@ -20,6 +21,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -478,7 +480,7 @@
                     deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
 //                    setCompany(map);
                     if ("liquid".equals(sensorType)) {
-                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength())?"0":deviceDataExcelDto.getStrength());
+                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
                         if (liquiddata <= 0) {
                             deviceDataExcelDto.setStrength("正常水位");
                         }
@@ -522,6 +524,7 @@
 
     /**
      * 查询公司名称、ID
+     *
      * @param dataMap
      */
     private void setCompany(Map<String, Object> dataMap) {
@@ -534,4 +537,24 @@
             }
         }
     }
+
+    public ResponseData getHydrantlist(DataScope dataScope, Page<HydrantDataDto> page, String deptid, String beginTime, String endTime, String keywords) {
+        ResponseData responseData = new ResponseData();
+        try {
+            List<HydrantDataDto> hydrantDataDtoList = this.baseMapper.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
+            hydrantDataDtoList.forEach(gasDectorDataDto -> {
+                gasDectorDataDto.setDeptName(permissionService.getDeptService().getDeptName(gasDectorDataDto.getDeptid()));
+            });
+            page.setRecords(hydrantDataDtoList);
+            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/ExcelModel/HydrantDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
new file mode 100644
index 0000000..455c641
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HydrantDataDto.java
@@ -0,0 +1,39 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+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;
+
+/**
+ * @author cz
+ * @date 2022-7-16
+ * 有害气体
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@NoArgsConstructor
+public class HydrantDataDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    @ExcelProperty("设备类型")
+    private String deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    private String deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    @ExcelProperty("状态")
+    private String status;
+    @ExcelProperty("记录时间")
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index 119445f..dc6e332 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -21,7 +21,8 @@
     LIQUIDGASDATA_EXPORT("gasLiquidData.xlsx", "gasLiquidData.xlsx", "燃气液位一体化数据"),
     ALARMJOB_EXPORT("alarmJobData.xlsx", "alarmJobData.xlsx", "预警工单"),
     ALARMRECORD_EXPORT("alarmRecordData.xlsx", "alarmRecordData.xlsx", "预警工单"),
-    METHANE_EXPORT("methaneData.xlsx", "methaneData.xlsx", "甲烷数据");
+    METHANE_EXPORT("methaneData.xlsx", "methaneData.xlsx", "甲烷数据"),
+    HYDRANT_EXPORT("hydrantData.xlsx", "hydrantData.xlsx", "消防栓数据") ;
     /**
      * 导出模板相对路径
      */