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 0f13e84..c72bae2 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
@@ -127,4 +127,24 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/gasdector/list")
+    public Object gasdectorList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGasdector> dataGasdectorList=  deviceDataListService.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataGasdectorList);
+    }
+
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/pantilt/list")
+    public Object pantiltList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataPantilt> dataPantiltList=  deviceDataListService.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataPantiltList);
+    }
+
 }

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 0f13e84..c72bae2 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
@@ -127,4 +127,24 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/gasdector/list")
+    public Object gasdectorList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGasdector> dataGasdectorList=  deviceDataListService.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataGasdectorList);
+    }
+
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/pantilt/list")
+    public Object pantiltList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataPantilt> dataPantiltList=  deviceDataListService.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataPantiltList);
+    }
+
 }
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 732dcc6..aeab8dd 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
@@ -35,9 +35,9 @@
 
     List<DataWellCoverLoca> selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
@@ -45,4 +45,8 @@
 
     List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
+    List<DataGasdector> getGasdectorList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
+    List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
 }

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 0f13e84..c72bae2 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
@@ -127,4 +127,24 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/gasdector/list")
+    public Object gasdectorList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGasdector> dataGasdectorList=  deviceDataListService.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataGasdectorList);
+    }
+
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/pantilt/list")
+    public Object pantiltList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataPantilt> dataPantiltList=  deviceDataListService.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataPantiltList);
+    }
+
 }
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 732dcc6..aeab8dd 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
@@ -35,9 +35,9 @@
 
     List<DataWellCoverLoca> selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
@@ -45,4 +45,8 @@
 
     List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
+    List<DataGasdector> getGasdectorList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
+    List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
 }
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 6ed130a..4235d85 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
@@ -1329,9 +1329,8 @@
                 </include>
             </if>
             <if test="keywords != null and keywords !=''">
-                AND (bd.DEVCODE LIKE
-                <include refid="keywords_sql"/>
-                OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+                AND (dh2s.DEVCODE LIKE <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE <include refid="keywords_sql"/>)
             </if>
         </where>
     </select>

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 0f13e84..c72bae2 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
@@ -127,4 +127,24 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/gasdector/list")
+    public Object gasdectorList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGasdector> dataGasdectorList=  deviceDataListService.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataGasdectorList);
+    }
+
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/pantilt/list")
+    public Object pantiltList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataPantilt> dataPantiltList=  deviceDataListService.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataPantiltList);
+    }
+
 }
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 732dcc6..aeab8dd 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
@@ -35,9 +35,9 @@
 
     List<DataWellCoverLoca> selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
@@ -45,4 +45,8 @@
 
     List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
+    List<DataGasdector> getGasdectorList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
+    List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
 }
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 6ed130a..4235d85 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
@@ -1329,9 +1329,8 @@
                 </include>
             </if>
             <if test="keywords != null and keywords !=''">
-                AND (bd.DEVCODE LIKE
-                <include refid="keywords_sql"/>
-                OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+                AND (dh2s.DEVCODE LIKE <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE <include refid="keywords_sql"/>)
             </if>
         </where>
     </select>
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 7010493..2e03ce5 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
@@ -647,4 +647,100 @@
             </if>
         </where>
     </select>
+
+
+    <select id="getGasdectorList" resultType="com.casic.missiles.modular.system.dto.statistic.DataGasdector">
+        SELECT
+        dgd.DEVCODE AS devcode,
+        bwi.WELL_CODE AS "wellCode",
+        dgd.GAS_SENSOR_STATE  AS  "gasSensorState",
+        dgd.GAS_SAMPLE_VALUE  AS  "gasSampleValue",
+        dgd.SINR AS sinr,
+        dgd.RSRP AS rsrp,
+        dgd.PCI AS pci,
+        dgd.CELL_ID  AS  cell,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.LOGTIME"/>
+        </include>
+        AS logtime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_gas_dector dgd
+        JOIN bus_device bd ON dgd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dgd.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dgd.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dgd.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getPantiltList" resultType="com.casic.missiles.modular.system.dto.statistic.DataPantilt">
+        SELECT
+        dp.DEVCODE AS devcode,
+        dp.WELL_CODE AS "wellCode",
+        dp.CONCENTRATION AS  concentration,
+        dp.DIRCETION AS  dircetion,
+        dp.PITCH AS  pitch,
+        dp.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.UPTIME"/>
+        </include>
+        AS uptime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.LOGTIME"/>
+        </include>
+        AS logtime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_pantilt dp
+        JOIN bus_device bd ON dp.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dp.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dp.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dp.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </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 0f13e84..c72bae2 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
@@ -127,4 +127,24 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/gasdector/list")
+    public Object gasdectorList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGasdector> dataGasdectorList=  deviceDataListService.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataGasdectorList);
+    }
+
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/pantilt/list")
+    public Object pantiltList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataPantilt> dataPantiltList=  deviceDataListService.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataPantiltList);
+    }
+
 }
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 732dcc6..aeab8dd 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
@@ -35,9 +35,9 @@
 
     List<DataWellCoverLoca> selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
@@ -45,4 +45,8 @@
 
     List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
+    List<DataGasdector> getGasdectorList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
+    List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
 }
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 6ed130a..4235d85 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
@@ -1329,9 +1329,8 @@
                 </include>
             </if>
             <if test="keywords != null and keywords !=''">
-                AND (bd.DEVCODE LIKE
-                <include refid="keywords_sql"/>
-                OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+                AND (dh2s.DEVCODE LIKE <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE <include refid="keywords_sql"/>)
             </if>
         </where>
     </select>
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 7010493..2e03ce5 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
@@ -647,4 +647,100 @@
             </if>
         </where>
     </select>
+
+
+    <select id="getGasdectorList" resultType="com.casic.missiles.modular.system.dto.statistic.DataGasdector">
+        SELECT
+        dgd.DEVCODE AS devcode,
+        bwi.WELL_CODE AS "wellCode",
+        dgd.GAS_SENSOR_STATE  AS  "gasSensorState",
+        dgd.GAS_SAMPLE_VALUE  AS  "gasSampleValue",
+        dgd.SINR AS sinr,
+        dgd.RSRP AS rsrp,
+        dgd.PCI AS pci,
+        dgd.CELL_ID  AS  cell,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.LOGTIME"/>
+        </include>
+        AS logtime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_gas_dector dgd
+        JOIN bus_device bd ON dgd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dgd.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dgd.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dgd.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getPantiltList" resultType="com.casic.missiles.modular.system.dto.statistic.DataPantilt">
+        SELECT
+        dp.DEVCODE AS devcode,
+        dp.WELL_CODE AS "wellCode",
+        dp.CONCENTRATION AS  concentration,
+        dp.DIRCETION AS  dircetion,
+        dp.PITCH AS  pitch,
+        dp.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.UPTIME"/>
+        </include>
+        AS uptime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.LOGTIME"/>
+        </include>
+        AS logtime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_pantilt dp
+        JOIN bus_device bd ON dp.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dp.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dp.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dp.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </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 f5225e8..a9f6c83 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
@@ -82,7 +82,7 @@
     </select>
 
     <select id="getPantiltDataListPage" resultType="com.casic.missiles.modular.system.model.PantiltDataDto">
-        SELECT dp.ID AS id，dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
+        SELECT dp.ID AS id,dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
         <include refid="date_toChar">
             <property name="paramTime" value="dp.UPTIME"/>
         </include>
@@ -130,9 +130,11 @@
 
 
     <select id="countRecordsByTime"  resultType="Map">
-        SELECT COUNT(1)  AS  "recodCounts",bwi.deptid
+        SELECT COUNT(1)  AS  "recodCounts"
         FROM ${tableName}   tn
-        JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
+        JOIN  bus_device  bd
+        JOIN  bus_device_well bdw  ON   bd.ID=bdw.DEVICE_ID
+        JOIN  bus_well_info   bwi  ON   bwi.ID=bdw.WELL_ID
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
             and tn.LOGTIME <![CDATA[ >= ]]>
@@ -146,24 +148,23 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY  deptid
     </select>
 
     <select id="countRecordsToday" resultType="int">
         SELECT COUNT(*)
-        from bus_device_status
-        JOIN bus_device_well  on bus_device_well.DEVICE_ID = bus_device_status.DEVICE_ID
-        JOIN bus_well_info  on bus_well_info.ID = bus_device_well.WELL_ID
+        from bus_device_status  bds
+        JOIN bus_device_well bdw  on bdw.DEVICE_ID = bds.DEVICE_ID
+        JOIN bus_well_info bwi  on bwi.ID = bdw.WELL_ID
         WHERE
-        bus_device_well.VALID and bus_well_info.VALID = '1'
+        bdw.VALID='1' and bwi.VALID = '1'
         <if test="beginTime != null and beginTime != '' ">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ >= ]]>
+            and bds.LAST_DATA_TS <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ <= ]]>
+            and bds.LAST_DATA_TS <![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/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java
index 0f13e84..c72bae2 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
@@ -127,4 +127,24 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/gasdector/list")
+    public Object gasdectorList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGasdector> dataGasdectorList=  deviceDataListService.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataGasdectorList);
+    }
+
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/pantilt/list")
+    public Object pantiltList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataPantilt> dataPantiltList=  deviceDataListService.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataPantiltList);
+    }
+
 }
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 732dcc6..aeab8dd 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
@@ -35,9 +35,9 @@
 
     List<DataWellCoverLoca> selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
@@ -45,4 +45,8 @@
 
     List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
+    List<DataGasdector> getGasdectorList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
+    List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
 }
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 6ed130a..4235d85 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
@@ -1329,9 +1329,8 @@
                 </include>
             </if>
             <if test="keywords != null and keywords !=''">
-                AND (bd.DEVCODE LIKE
-                <include refid="keywords_sql"/>
-                OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+                AND (dh2s.DEVCODE LIKE <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE <include refid="keywords_sql"/>)
             </if>
         </where>
     </select>
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 7010493..2e03ce5 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
@@ -647,4 +647,100 @@
             </if>
         </where>
     </select>
+
+
+    <select id="getGasdectorList" resultType="com.casic.missiles.modular.system.dto.statistic.DataGasdector">
+        SELECT
+        dgd.DEVCODE AS devcode,
+        bwi.WELL_CODE AS "wellCode",
+        dgd.GAS_SENSOR_STATE  AS  "gasSensorState",
+        dgd.GAS_SAMPLE_VALUE  AS  "gasSampleValue",
+        dgd.SINR AS sinr,
+        dgd.RSRP AS rsrp,
+        dgd.PCI AS pci,
+        dgd.CELL_ID  AS  cell,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.LOGTIME"/>
+        </include>
+        AS logtime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_gas_dector dgd
+        JOIN bus_device bd ON dgd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dgd.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dgd.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dgd.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getPantiltList" resultType="com.casic.missiles.modular.system.dto.statistic.DataPantilt">
+        SELECT
+        dp.DEVCODE AS devcode,
+        dp.WELL_CODE AS "wellCode",
+        dp.CONCENTRATION AS  concentration,
+        dp.DIRCETION AS  dircetion,
+        dp.PITCH AS  pitch,
+        dp.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.UPTIME"/>
+        </include>
+        AS uptime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.LOGTIME"/>
+        </include>
+        AS logtime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_pantilt dp
+        JOIN bus_device bd ON dp.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dp.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dp.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dp.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </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 f5225e8..a9f6c83 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
@@ -82,7 +82,7 @@
     </select>
 
     <select id="getPantiltDataListPage" resultType="com.casic.missiles.modular.system.model.PantiltDataDto">
-        SELECT dp.ID AS id，dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
+        SELECT dp.ID AS id,dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
         <include refid="date_toChar">
             <property name="paramTime" value="dp.UPTIME"/>
         </include>
@@ -130,9 +130,11 @@
 
 
     <select id="countRecordsByTime"  resultType="Map">
-        SELECT COUNT(1)  AS  "recodCounts",bwi.deptid
+        SELECT COUNT(1)  AS  "recodCounts"
         FROM ${tableName}   tn
-        JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
+        JOIN  bus_device  bd
+        JOIN  bus_device_well bdw  ON   bd.ID=bdw.DEVICE_ID
+        JOIN  bus_well_info   bwi  ON   bwi.ID=bdw.WELL_ID
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
             and tn.LOGTIME <![CDATA[ >= ]]>
@@ -146,24 +148,23 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY  deptid
     </select>
 
     <select id="countRecordsToday" resultType="int">
         SELECT COUNT(*)
-        from bus_device_status
-        JOIN bus_device_well  on bus_device_well.DEVICE_ID = bus_device_status.DEVICE_ID
-        JOIN bus_well_info  on bus_well_info.ID = bus_device_well.WELL_ID
+        from bus_device_status  bds
+        JOIN bus_device_well bdw  on bdw.DEVICE_ID = bds.DEVICE_ID
+        JOIN bus_well_info bwi  on bwi.ID = bdw.WELL_ID
         WHERE
-        bus_device_well.VALID and bus_well_info.VALID = '1'
+        bdw.VALID='1' and bwi.VALID = '1'
         <if test="beginTime != null and beginTime != '' ">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ >= ]]>
+            and bds.LAST_DATA_TS <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ <= ]]>
+            and bds.LAST_DATA_TS <![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/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 9bfe937..b6c3c87 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
@@ -61,4 +61,9 @@
 
     List<DataH2s> getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
 
+    List<DataGasdector> getGasdectorList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+    List<DataPantilt> getPantiltList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+
 }
\ 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 0f13e84..c72bae2 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
@@ -127,4 +127,24 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/gasdector/list")
+    public Object gasdectorList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGasdector> dataGasdectorList=  deviceDataListService.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataGasdectorList);
+    }
+
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/pantilt/list")
+    public Object pantiltList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataPantilt> dataPantiltList=  deviceDataListService.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataPantiltList);
+    }
+
 }
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 732dcc6..aeab8dd 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
@@ -35,9 +35,9 @@
 
     List<DataWellCoverLoca> selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
@@ -45,4 +45,8 @@
 
     List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
+    List<DataGasdector> getGasdectorList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
+    List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
 }
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 6ed130a..4235d85 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
@@ -1329,9 +1329,8 @@
                 </include>
             </if>
             <if test="keywords != null and keywords !=''">
-                AND (bd.DEVCODE LIKE
-                <include refid="keywords_sql"/>
-                OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+                AND (dh2s.DEVCODE LIKE <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE <include refid="keywords_sql"/>)
             </if>
         </where>
     </select>
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 7010493..2e03ce5 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
@@ -647,4 +647,100 @@
             </if>
         </where>
     </select>
+
+
+    <select id="getGasdectorList" resultType="com.casic.missiles.modular.system.dto.statistic.DataGasdector">
+        SELECT
+        dgd.DEVCODE AS devcode,
+        bwi.WELL_CODE AS "wellCode",
+        dgd.GAS_SENSOR_STATE  AS  "gasSensorState",
+        dgd.GAS_SAMPLE_VALUE  AS  "gasSampleValue",
+        dgd.SINR AS sinr,
+        dgd.RSRP AS rsrp,
+        dgd.PCI AS pci,
+        dgd.CELL_ID  AS  cell,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.LOGTIME"/>
+        </include>
+        AS logtime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_gas_dector dgd
+        JOIN bus_device bd ON dgd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dgd.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dgd.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dgd.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getPantiltList" resultType="com.casic.missiles.modular.system.dto.statistic.DataPantilt">
+        SELECT
+        dp.DEVCODE AS devcode,
+        dp.WELL_CODE AS "wellCode",
+        dp.CONCENTRATION AS  concentration,
+        dp.DIRCETION AS  dircetion,
+        dp.PITCH AS  pitch,
+        dp.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.UPTIME"/>
+        </include>
+        AS uptime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.LOGTIME"/>
+        </include>
+        AS logtime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_pantilt dp
+        JOIN bus_device bd ON dp.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dp.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dp.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dp.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </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 f5225e8..a9f6c83 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
@@ -82,7 +82,7 @@
     </select>
 
     <select id="getPantiltDataListPage" resultType="com.casic.missiles.modular.system.model.PantiltDataDto">
-        SELECT dp.ID AS id，dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
+        SELECT dp.ID AS id,dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
         <include refid="date_toChar">
             <property name="paramTime" value="dp.UPTIME"/>
         </include>
@@ -130,9 +130,11 @@
 
 
     <select id="countRecordsByTime"  resultType="Map">
-        SELECT COUNT(1)  AS  "recodCounts",bwi.deptid
+        SELECT COUNT(1)  AS  "recodCounts"
         FROM ${tableName}   tn
-        JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
+        JOIN  bus_device  bd
+        JOIN  bus_device_well bdw  ON   bd.ID=bdw.DEVICE_ID
+        JOIN  bus_well_info   bwi  ON   bwi.ID=bdw.WELL_ID
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
             and tn.LOGTIME <![CDATA[ >= ]]>
@@ -146,24 +148,23 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY  deptid
     </select>
 
     <select id="countRecordsToday" resultType="int">
         SELECT COUNT(*)
-        from bus_device_status
-        JOIN bus_device_well  on bus_device_well.DEVICE_ID = bus_device_status.DEVICE_ID
-        JOIN bus_well_info  on bus_well_info.ID = bus_device_well.WELL_ID
+        from bus_device_status  bds
+        JOIN bus_device_well bdw  on bdw.DEVICE_ID = bds.DEVICE_ID
+        JOIN bus_well_info bwi  on bwi.ID = bdw.WELL_ID
         WHERE
-        bus_device_well.VALID and bus_well_info.VALID = '1'
+        bdw.VALID='1' and bwi.VALID = '1'
         <if test="beginTime != null and beginTime != '' ">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ >= ]]>
+            and bds.LAST_DATA_TS <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ <= ]]>
+            and bds.LAST_DATA_TS <![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/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 9bfe937..b6c3c87 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
@@ -61,4 +61,9 @@
 
     List<DataH2s> getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
 
+    List<DataGasdector> getGasdectorList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+    List<DataPantilt> getPantiltList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+
 }
\ No newline at end of file
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 5abf45c..a35dde1 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
@@ -109,4 +109,15 @@
     public List<DataH2s> getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) {
         return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode);
     }
+
+    @Override
+    public List<DataGasdector> getGasdectorList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){
+        return this.baseMapper.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+    }
+
+    @Override
+    public List<DataPantilt> getPantiltList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){
+        return this.baseMapper.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+    }
+
 }

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 0f13e84..c72bae2 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
@@ -127,4 +127,24 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/gasdector/list")
+    public Object gasdectorList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGasdector> dataGasdectorList=  deviceDataListService.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataGasdectorList);
+    }
+
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/pantilt/list")
+    public Object pantiltList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataPantilt> dataPantiltList=  deviceDataListService.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataPantiltList);
+    }
+
 }
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 732dcc6..aeab8dd 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
@@ -35,9 +35,9 @@
 
     List<DataWellCoverLoca> selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
@@ -45,4 +45,8 @@
 
     List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
+    List<DataGasdector> getGasdectorList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
+    List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
 }
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 6ed130a..4235d85 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
@@ -1329,9 +1329,8 @@
                 </include>
             </if>
             <if test="keywords != null and keywords !=''">
-                AND (bd.DEVCODE LIKE
-                <include refid="keywords_sql"/>
-                OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+                AND (dh2s.DEVCODE LIKE <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE <include refid="keywords_sql"/>)
             </if>
         </where>
     </select>
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 7010493..2e03ce5 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
@@ -647,4 +647,100 @@
             </if>
         </where>
     </select>
+
+
+    <select id="getGasdectorList" resultType="com.casic.missiles.modular.system.dto.statistic.DataGasdector">
+        SELECT
+        dgd.DEVCODE AS devcode,
+        bwi.WELL_CODE AS "wellCode",
+        dgd.GAS_SENSOR_STATE  AS  "gasSensorState",
+        dgd.GAS_SAMPLE_VALUE  AS  "gasSampleValue",
+        dgd.SINR AS sinr,
+        dgd.RSRP AS rsrp,
+        dgd.PCI AS pci,
+        dgd.CELL_ID  AS  cell,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.LOGTIME"/>
+        </include>
+        AS logtime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_gas_dector dgd
+        JOIN bus_device bd ON dgd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dgd.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dgd.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dgd.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getPantiltList" resultType="com.casic.missiles.modular.system.dto.statistic.DataPantilt">
+        SELECT
+        dp.DEVCODE AS devcode,
+        dp.WELL_CODE AS "wellCode",
+        dp.CONCENTRATION AS  concentration,
+        dp.DIRCETION AS  dircetion,
+        dp.PITCH AS  pitch,
+        dp.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.UPTIME"/>
+        </include>
+        AS uptime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.LOGTIME"/>
+        </include>
+        AS logtime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_pantilt dp
+        JOIN bus_device bd ON dp.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dp.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dp.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dp.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </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 f5225e8..a9f6c83 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
@@ -82,7 +82,7 @@
     </select>
 
     <select id="getPantiltDataListPage" resultType="com.casic.missiles.modular.system.model.PantiltDataDto">
-        SELECT dp.ID AS id，dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
+        SELECT dp.ID AS id,dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
         <include refid="date_toChar">
             <property name="paramTime" value="dp.UPTIME"/>
         </include>
@@ -130,9 +130,11 @@
 
 
     <select id="countRecordsByTime"  resultType="Map">
-        SELECT COUNT(1)  AS  "recodCounts",bwi.deptid
+        SELECT COUNT(1)  AS  "recodCounts"
         FROM ${tableName}   tn
-        JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
+        JOIN  bus_device  bd
+        JOIN  bus_device_well bdw  ON   bd.ID=bdw.DEVICE_ID
+        JOIN  bus_well_info   bwi  ON   bwi.ID=bdw.WELL_ID
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
             and tn.LOGTIME <![CDATA[ >= ]]>
@@ -146,24 +148,23 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY  deptid
     </select>
 
     <select id="countRecordsToday" resultType="int">
         SELECT COUNT(*)
-        from bus_device_status
-        JOIN bus_device_well  on bus_device_well.DEVICE_ID = bus_device_status.DEVICE_ID
-        JOIN bus_well_info  on bus_well_info.ID = bus_device_well.WELL_ID
+        from bus_device_status  bds
+        JOIN bus_device_well bdw  on bdw.DEVICE_ID = bds.DEVICE_ID
+        JOIN bus_well_info bwi  on bwi.ID = bdw.WELL_ID
         WHERE
-        bus_device_well.VALID and bus_well_info.VALID = '1'
+        bdw.VALID='1' and bwi.VALID = '1'
         <if test="beginTime != null and beginTime != '' ">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ >= ]]>
+            and bds.LAST_DATA_TS <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ <= ]]>
+            and bds.LAST_DATA_TS <![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/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 9bfe937..b6c3c87 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
@@ -61,4 +61,9 @@
 
     List<DataH2s> getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
 
+    List<DataGasdector> getGasdectorList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+    List<DataPantilt> getPantiltList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+
 }
\ No newline at end of file
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 5abf45c..a35dde1 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
@@ -109,4 +109,15 @@
     public List<DataH2s> getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) {
         return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode);
     }
+
+    @Override
+    public List<DataGasdector> getGasdectorList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){
+        return this.baseMapper.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+    }
+
+    @Override
+    public List<DataPantilt> getPantiltList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){
+        return this.baseMapper.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
index cdbe4d9..03a164e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
@@ -86,7 +86,7 @@
             responseData.setMessage("查询成功");
             responseData.setCode(200);
         } catch (DataAccessException dex) {
-            log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex);
+            log.error("主题：查询历史设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex);
             responseData.setMessage("查询异常");
             responseData.setCode(500);
         }
@@ -133,10 +133,13 @@
         for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) {
             countRecords = new HashMap<>();
             Integer typeId = Integer.valueOf(deviceType.toString());
-            String tableName = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
-                    get(typeId).getTableName();
+            DeviceDataTableEnum deviceDataTableEnum = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().get(typeId);
+            if (deviceDataTableEnum == null) {
+                continue;
+            }
+            String tableName = deviceDataTableEnum.getTableName();
             Map<String, Object> recordCounts = thirdPartyMapper.countRecordsByTime(dataScope, beginTime, endTime, tableName);
-            countRecords.put("countRecords",recordCounts==null || recordCounts.get("recodCounts") == null ? "0": recordCounts.get("recodCounts").toString());
+            countRecords.put("countRecords", recordCounts == null || recordCounts.get("recodCounts") == null ? "0" : recordCounts.get("recodCounts").toString());
             countRecords.put("deviceName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
                     get(Integer.valueOf(deviceType.toString())).getTypeName());
             countRecordList.add(countRecords);

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 0f13e84..c72bae2 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
@@ -127,4 +127,24 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/gasdector/list")
+    public Object gasdectorList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGasdector> dataGasdectorList=  deviceDataListService.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataGasdectorList);
+    }
+
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/pantilt/list")
+    public Object pantiltList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataPantilt> dataPantiltList=  deviceDataListService.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataPantiltList);
+    }
+
 }
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 732dcc6..aeab8dd 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
@@ -35,9 +35,9 @@
 
     List<DataWellCoverLoca> selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
@@ -45,4 +45,8 @@
 
     List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
+    List<DataGasdector> getGasdectorList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
+    List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
 }
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 6ed130a..4235d85 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
@@ -1329,9 +1329,8 @@
                 </include>
             </if>
             <if test="keywords != null and keywords !=''">
-                AND (bd.DEVCODE LIKE
-                <include refid="keywords_sql"/>
-                OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+                AND (dh2s.DEVCODE LIKE <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE <include refid="keywords_sql"/>)
             </if>
         </where>
     </select>
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 7010493..2e03ce5 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
@@ -647,4 +647,100 @@
             </if>
         </where>
     </select>
+
+
+    <select id="getGasdectorList" resultType="com.casic.missiles.modular.system.dto.statistic.DataGasdector">
+        SELECT
+        dgd.DEVCODE AS devcode,
+        bwi.WELL_CODE AS "wellCode",
+        dgd.GAS_SENSOR_STATE  AS  "gasSensorState",
+        dgd.GAS_SAMPLE_VALUE  AS  "gasSampleValue",
+        dgd.SINR AS sinr,
+        dgd.RSRP AS rsrp,
+        dgd.PCI AS pci,
+        dgd.CELL_ID  AS  cell,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.LOGTIME"/>
+        </include>
+        AS logtime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_gas_dector dgd
+        JOIN bus_device bd ON dgd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dgd.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dgd.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dgd.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getPantiltList" resultType="com.casic.missiles.modular.system.dto.statistic.DataPantilt">
+        SELECT
+        dp.DEVCODE AS devcode,
+        dp.WELL_CODE AS "wellCode",
+        dp.CONCENTRATION AS  concentration,
+        dp.DIRCETION AS  dircetion,
+        dp.PITCH AS  pitch,
+        dp.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.UPTIME"/>
+        </include>
+        AS uptime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.LOGTIME"/>
+        </include>
+        AS logtime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_pantilt dp
+        JOIN bus_device bd ON dp.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dp.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dp.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dp.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </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 f5225e8..a9f6c83 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
@@ -82,7 +82,7 @@
     </select>
 
     <select id="getPantiltDataListPage" resultType="com.casic.missiles.modular.system.model.PantiltDataDto">
-        SELECT dp.ID AS id，dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
+        SELECT dp.ID AS id,dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
         <include refid="date_toChar">
             <property name="paramTime" value="dp.UPTIME"/>
         </include>
@@ -130,9 +130,11 @@
 
 
     <select id="countRecordsByTime"  resultType="Map">
-        SELECT COUNT(1)  AS  "recodCounts",bwi.deptid
+        SELECT COUNT(1)  AS  "recodCounts"
         FROM ${tableName}   tn
-        JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
+        JOIN  bus_device  bd
+        JOIN  bus_device_well bdw  ON   bd.ID=bdw.DEVICE_ID
+        JOIN  bus_well_info   bwi  ON   bwi.ID=bdw.WELL_ID
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
             and tn.LOGTIME <![CDATA[ >= ]]>
@@ -146,24 +148,23 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY  deptid
     </select>
 
     <select id="countRecordsToday" resultType="int">
         SELECT COUNT(*)
-        from bus_device_status
-        JOIN bus_device_well  on bus_device_well.DEVICE_ID = bus_device_status.DEVICE_ID
-        JOIN bus_well_info  on bus_well_info.ID = bus_device_well.WELL_ID
+        from bus_device_status  bds
+        JOIN bus_device_well bdw  on bdw.DEVICE_ID = bds.DEVICE_ID
+        JOIN bus_well_info bwi  on bwi.ID = bdw.WELL_ID
         WHERE
-        bus_device_well.VALID and bus_well_info.VALID = '1'
+        bdw.VALID='1' and bwi.VALID = '1'
         <if test="beginTime != null and beginTime != '' ">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ >= ]]>
+            and bds.LAST_DATA_TS <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ <= ]]>
+            and bds.LAST_DATA_TS <![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/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 9bfe937..b6c3c87 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
@@ -61,4 +61,9 @@
 
     List<DataH2s> getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
 
+    List<DataGasdector> getGasdectorList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+    List<DataPantilt> getPantiltList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+
 }
\ No newline at end of file
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 5abf45c..a35dde1 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
@@ -109,4 +109,15 @@
     public List<DataH2s> getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) {
         return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode);
     }
+
+    @Override
+    public List<DataGasdector> getGasdectorList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){
+        return this.baseMapper.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+    }
+
+    @Override
+    public List<DataPantilt> getPantiltList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){
+        return this.baseMapper.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
index cdbe4d9..03a164e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
@@ -86,7 +86,7 @@
             responseData.setMessage("查询成功");
             responseData.setCode(200);
         } catch (DataAccessException dex) {
-            log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex);
+            log.error("主题：查询历史设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex);
             responseData.setMessage("查询异常");
             responseData.setCode(500);
         }
@@ -133,10 +133,13 @@
         for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) {
             countRecords = new HashMap<>();
             Integer typeId = Integer.valueOf(deviceType.toString());
-            String tableName = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
-                    get(typeId).getTableName();
+            DeviceDataTableEnum deviceDataTableEnum = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().get(typeId);
+            if (deviceDataTableEnum == null) {
+                continue;
+            }
+            String tableName = deviceDataTableEnum.getTableName();
             Map<String, Object> recordCounts = thirdPartyMapper.countRecordsByTime(dataScope, beginTime, endTime, tableName);
-            countRecords.put("countRecords",recordCounts==null || recordCounts.get("recodCounts") == null ? "0": recordCounts.get("recodCounts").toString());
+            countRecords.put("countRecords", recordCounts == null || recordCounts.get("recodCounts") == null ? "0" : recordCounts.get("recodCounts").toString());
             countRecords.put("deviceName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
                     get(Integer.valueOf(deviceType.toString())).getTypeName());
             countRecordList.add(countRecords);
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasdector.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasdector.java
new file mode 100644
index 0000000..8c61f1b
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasdector.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataGasdector {
+    private String devcode;
+    private String wellCode;
+    private String gasSensorState;
+    private String gasSampleValue;
+    private String sinr;
+    private String rsrp;
+    private String pci;
+    private String cell;
+
+    private String logtime;
+    private String uptime;
+}

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 0f13e84..c72bae2 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
@@ -127,4 +127,24 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/gasdector/list")
+    public Object gasdectorList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGasdector> dataGasdectorList=  deviceDataListService.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataGasdectorList);
+    }
+
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/pantilt/list")
+    public Object pantiltList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataPantilt> dataPantiltList=  deviceDataListService.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataPantiltList);
+    }
+
 }
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 732dcc6..aeab8dd 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
@@ -35,9 +35,9 @@
 
     List<DataWellCoverLoca> selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
@@ -45,4 +45,8 @@
 
     List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
+    List<DataGasdector> getGasdectorList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
+    List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
 }
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 6ed130a..4235d85 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
@@ -1329,9 +1329,8 @@
                 </include>
             </if>
             <if test="keywords != null and keywords !=''">
-                AND (bd.DEVCODE LIKE
-                <include refid="keywords_sql"/>
-                OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+                AND (dh2s.DEVCODE LIKE <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE <include refid="keywords_sql"/>)
             </if>
         </where>
     </select>
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 7010493..2e03ce5 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
@@ -647,4 +647,100 @@
             </if>
         </where>
     </select>
+
+
+    <select id="getGasdectorList" resultType="com.casic.missiles.modular.system.dto.statistic.DataGasdector">
+        SELECT
+        dgd.DEVCODE AS devcode,
+        bwi.WELL_CODE AS "wellCode",
+        dgd.GAS_SENSOR_STATE  AS  "gasSensorState",
+        dgd.GAS_SAMPLE_VALUE  AS  "gasSampleValue",
+        dgd.SINR AS sinr,
+        dgd.RSRP AS rsrp,
+        dgd.PCI AS pci,
+        dgd.CELL_ID  AS  cell,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.LOGTIME"/>
+        </include>
+        AS logtime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_gas_dector dgd
+        JOIN bus_device bd ON dgd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dgd.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dgd.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dgd.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getPantiltList" resultType="com.casic.missiles.modular.system.dto.statistic.DataPantilt">
+        SELECT
+        dp.DEVCODE AS devcode,
+        dp.WELL_CODE AS "wellCode",
+        dp.CONCENTRATION AS  concentration,
+        dp.DIRCETION AS  dircetion,
+        dp.PITCH AS  pitch,
+        dp.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.UPTIME"/>
+        </include>
+        AS uptime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.LOGTIME"/>
+        </include>
+        AS logtime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_pantilt dp
+        JOIN bus_device bd ON dp.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dp.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dp.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dp.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </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 f5225e8..a9f6c83 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
@@ -82,7 +82,7 @@
     </select>
 
     <select id="getPantiltDataListPage" resultType="com.casic.missiles.modular.system.model.PantiltDataDto">
-        SELECT dp.ID AS id，dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
+        SELECT dp.ID AS id,dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
         <include refid="date_toChar">
             <property name="paramTime" value="dp.UPTIME"/>
         </include>
@@ -130,9 +130,11 @@
 
 
     <select id="countRecordsByTime"  resultType="Map">
-        SELECT COUNT(1)  AS  "recodCounts",bwi.deptid
+        SELECT COUNT(1)  AS  "recodCounts"
         FROM ${tableName}   tn
-        JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
+        JOIN  bus_device  bd
+        JOIN  bus_device_well bdw  ON   bd.ID=bdw.DEVICE_ID
+        JOIN  bus_well_info   bwi  ON   bwi.ID=bdw.WELL_ID
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
             and tn.LOGTIME <![CDATA[ >= ]]>
@@ -146,24 +148,23 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY  deptid
     </select>
 
     <select id="countRecordsToday" resultType="int">
         SELECT COUNT(*)
-        from bus_device_status
-        JOIN bus_device_well  on bus_device_well.DEVICE_ID = bus_device_status.DEVICE_ID
-        JOIN bus_well_info  on bus_well_info.ID = bus_device_well.WELL_ID
+        from bus_device_status  bds
+        JOIN bus_device_well bdw  on bdw.DEVICE_ID = bds.DEVICE_ID
+        JOIN bus_well_info bwi  on bwi.ID = bdw.WELL_ID
         WHERE
-        bus_device_well.VALID and bus_well_info.VALID = '1'
+        bdw.VALID='1' and bwi.VALID = '1'
         <if test="beginTime != null and beginTime != '' ">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ >= ]]>
+            and bds.LAST_DATA_TS <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ <= ]]>
+            and bds.LAST_DATA_TS <![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/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 9bfe937..b6c3c87 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
@@ -61,4 +61,9 @@
 
     List<DataH2s> getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
 
+    List<DataGasdector> getGasdectorList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+    List<DataPantilt> getPantiltList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+
 }
\ No newline at end of file
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 5abf45c..a35dde1 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
@@ -109,4 +109,15 @@
     public List<DataH2s> getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) {
         return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode);
     }
+
+    @Override
+    public List<DataGasdector> getGasdectorList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){
+        return this.baseMapper.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+    }
+
+    @Override
+    public List<DataPantilt> getPantiltList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){
+        return this.baseMapper.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
index cdbe4d9..03a164e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
@@ -86,7 +86,7 @@
             responseData.setMessage("查询成功");
             responseData.setCode(200);
         } catch (DataAccessException dex) {
-            log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex);
+            log.error("主题：查询历史设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex);
             responseData.setMessage("查询异常");
             responseData.setCode(500);
         }
@@ -133,10 +133,13 @@
         for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) {
             countRecords = new HashMap<>();
             Integer typeId = Integer.valueOf(deviceType.toString());
-            String tableName = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
-                    get(typeId).getTableName();
+            DeviceDataTableEnum deviceDataTableEnum = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().get(typeId);
+            if (deviceDataTableEnum == null) {
+                continue;
+            }
+            String tableName = deviceDataTableEnum.getTableName();
             Map<String, Object> recordCounts = thirdPartyMapper.countRecordsByTime(dataScope, beginTime, endTime, tableName);
-            countRecords.put("countRecords",recordCounts==null || recordCounts.get("recodCounts") == null ? "0": recordCounts.get("recodCounts").toString());
+            countRecords.put("countRecords", recordCounts == null || recordCounts.get("recodCounts") == null ? "0" : recordCounts.get("recodCounts").toString());
             countRecords.put("deviceName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
                     get(Integer.valueOf(deviceType.toString())).getTypeName());
             countRecordList.add(countRecords);
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasdector.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasdector.java
new file mode 100644
index 0000000..8c61f1b
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasdector.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataGasdector {
+    private String devcode;
+    private String wellCode;
+    private String gasSensorState;
+    private String gasSampleValue;
+    private String sinr;
+    private String rsrp;
+    private String pci;
+    private String cell;
+
+    private String logtime;
+    private String uptime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataPantilt.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataPantilt.java
new file mode 100644
index 0000000..63d33d7
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataPantilt.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataPantilt{
+    private String devcode;
+    private String wellCode;
+    private String concentration;
+    private String dircetion;
+    private String pitch;
+    private String logtime;
+    private String uptime;
+}

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 0f13e84..c72bae2 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
@@ -127,4 +127,24 @@
         return ResponseData.success(mapList);
     }
 
+    /**
+     * 消防栓列表
+     */
+    @GetMapping(value = "/gasdector/list")
+    public Object gasdectorList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataGasdector> dataGasdectorList=  deviceDataListService.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataGasdectorList);
+    }
+
+    /**
+     * 硫化氢列表
+     */
+    @GetMapping(value = "/pantilt/list")
+    public Object pantiltList(String devcode, String wellCode, String beginTime, String endTime) {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        List<DataPantilt> dataPantiltList=  deviceDataListService.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+        return ResponseData.success(dataPantiltList);
+    }
+
 }
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 732dcc6..aeab8dd 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
@@ -35,9 +35,9 @@
 
     List<DataWellCoverLoca> selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+    List<DataGasLiquid> selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
     List<DateTube> selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
@@ -45,4 +45,8 @@
 
     List<DataH2s> selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
+    List<DataGasdector> getGasdectorList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
+    List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
+
 }
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 6ed130a..4235d85 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
@@ -1329,9 +1329,8 @@
                 </include>
             </if>
             <if test="keywords != null and keywords !=''">
-                AND (bd.DEVCODE LIKE
-                <include refid="keywords_sql"/>
-                OR bd.WELL_CODE LIKE<include refid="keywords_sql"/>)
+                AND (dh2s.DEVCODE LIKE <include refid="keywords_sql"/>
+                OR dh2s.WELL_CODE LIKE <include refid="keywords_sql"/>)
             </if>
         </where>
     </select>
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 7010493..2e03ce5 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
@@ -647,4 +647,100 @@
             </if>
         </where>
     </select>
+
+
+    <select id="getGasdectorList" resultType="com.casic.missiles.modular.system.dto.statistic.DataGasdector">
+        SELECT
+        dgd.DEVCODE AS devcode,
+        bwi.WELL_CODE AS "wellCode",
+        dgd.GAS_SENSOR_STATE  AS  "gasSensorState",
+        dgd.GAS_SAMPLE_VALUE  AS  "gasSampleValue",
+        dgd.SINR AS sinr,
+        dgd.RSRP AS rsrp,
+        dgd.PCI AS pci,
+        dgd.CELL_ID  AS  cell,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.LOGTIME"/>
+        </include>
+        AS logtime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dgd.UPTIME"/>
+        </include>
+        AS uptime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_gas_dector dgd
+        JOIN bus_device bd ON dgd.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dgd.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dgd.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dgd.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getPantiltList" resultType="com.casic.missiles.modular.system.dto.statistic.DataPantilt">
+        SELECT
+        dp.DEVCODE AS devcode,
+        dp.WELL_CODE AS "wellCode",
+        dp.CONCENTRATION AS  concentration,
+        dp.DIRCETION AS  dircetion,
+        dp.PITCH AS  pitch,
+        dp.CELL,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.UPTIME"/>
+        </include>
+        AS uptime,
+        <include refid="date_toChar">
+            <property name="paramTime" value="dp.LOGTIME"/>
+        </include>
+        AS logtime,
+        bwi.deptid,
+        bd.device_type as deviceType
+        FROM data_pantilt dp
+        JOIN bus_device bd ON dp.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
+        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="devcode != null and devcode !=''">
+                AND dp.DEVCODE = #{devcode}
+            </if>
+            <if test="wellCode != null and wellCode !=''">
+                AND bwi.WELL_CODE = #{wellCode}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dp.UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dp.UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </if>
+        </where>
+    </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 f5225e8..a9f6c83 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
@@ -82,7 +82,7 @@
     </select>
 
     <select id="getPantiltDataListPage" resultType="com.casic.missiles.modular.system.model.PantiltDataDto">
-        SELECT dp.ID AS id，dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
+        SELECT dp.ID AS id,dp.DEVCODE AS devcode,dp.dircetion,dp.pitch,dp.concentration,
         <include refid="date_toChar">
             <property name="paramTime" value="dp.UPTIME"/>
         </include>
@@ -130,9 +130,11 @@
 
 
     <select id="countRecordsByTime"  resultType="Map">
-        SELECT COUNT(1)  AS  "recodCounts",bwi.deptid
+        SELECT COUNT(1)  AS  "recodCounts"
         FROM ${tableName}   tn
-        JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
+        JOIN  bus_device  bd
+        JOIN  bus_device_well bdw  ON   bd.ID=bdw.DEVICE_ID
+        JOIN  bus_well_info   bwi  ON   bwi.ID=bdw.WELL_ID
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
             and tn.LOGTIME <![CDATA[ >= ]]>
@@ -146,24 +148,23 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        GROUP BY  deptid
     </select>
 
     <select id="countRecordsToday" resultType="int">
         SELECT COUNT(*)
-        from bus_device_status
-        JOIN bus_device_well  on bus_device_well.DEVICE_ID = bus_device_status.DEVICE_ID
-        JOIN bus_well_info  on bus_well_info.ID = bus_device_well.WELL_ID
+        from bus_device_status  bds
+        JOIN bus_device_well bdw  on bdw.DEVICE_ID = bds.DEVICE_ID
+        JOIN bus_well_info bwi  on bwi.ID = bdw.WELL_ID
         WHERE
-        bus_device_well.VALID and bus_well_info.VALID = '1'
+        bdw.VALID='1' and bwi.VALID = '1'
         <if test="beginTime != null and beginTime != '' ">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ >= ]]>
+            and bds.LAST_DATA_TS <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and bus_device_status.LAST_DATA_TS <![CDATA[ <= ]]>
+            and bds.LAST_DATA_TS <![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/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java
index 9bfe937..b6c3c87 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
@@ -61,4 +61,9 @@
 
     List<DataH2s> getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
 
+    List<DataGasdector> getGasdectorList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+    List<DataPantilt> getPantiltList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode);
+
+
 }
\ No newline at end of file
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 5abf45c..a35dde1 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
@@ -109,4 +109,15 @@
     public List<DataH2s> getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) {
         return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode);
     }
+
+    @Override
+    public List<DataGasdector> getGasdectorList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){
+        return this.baseMapper.getGasdectorList(dataScope, devcode, beginTime, endTime, wellCode);
+    }
+
+    @Override
+    public List<DataPantilt> getPantiltList(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){
+        return this.baseMapper.getPantiltList(dataScope, devcode, beginTime, endTime, wellCode);
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
index cdbe4d9..03a164e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
@@ -86,7 +86,7 @@
             responseData.setMessage("查询成功");
             responseData.setCode(200);
         } catch (DataAccessException dex) {
-            log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex);
+            log.error("主题：查询历史设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex);
             responseData.setMessage("查询异常");
             responseData.setCode(500);
         }
@@ -133,10 +133,13 @@
         for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) {
             countRecords = new HashMap<>();
             Integer typeId = Integer.valueOf(deviceType.toString());
-            String tableName = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
-                    get(typeId).getTableName();
+            DeviceDataTableEnum deviceDataTableEnum = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().get(typeId);
+            if (deviceDataTableEnum == null) {
+                continue;
+            }
+            String tableName = deviceDataTableEnum.getTableName();
             Map<String, Object> recordCounts = thirdPartyMapper.countRecordsByTime(dataScope, beginTime, endTime, tableName);
-            countRecords.put("countRecords",recordCounts==null || recordCounts.get("recodCounts") == null ? "0": recordCounts.get("recodCounts").toString());
+            countRecords.put("countRecords", recordCounts == null || recordCounts.get("recodCounts") == null ? "0" : recordCounts.get("recodCounts").toString());
             countRecords.put("deviceName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
                     get(Integer.valueOf(deviceType.toString())).getTypeName());
             countRecordList.add(countRecords);
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasdector.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasdector.java
new file mode 100644
index 0000000..8c61f1b
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasdector.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataGasdector {
+    private String devcode;
+    private String wellCode;
+    private String gasSensorState;
+    private String gasSampleValue;
+    private String sinr;
+    private String rsrp;
+    private String pci;
+    private String cell;
+
+    private String logtime;
+    private String uptime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataPantilt.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataPantilt.java
new file mode 100644
index 0000000..63d33d7
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataPantilt.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.modular.system.dto.statistic;
+
+import lombok.Data;
+
+@Data
+public class DataPantilt{
+    private String devcode;
+    private String wellCode;
+    private String concentration;
+    private String dircetion;
+    private String pitch;
+    private String logtime;
+    private String uptime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java
index eb8fd5d..e59be76 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataTableEnum.java
@@ -24,6 +24,7 @@
     DATA_WELLCOVER_DATA("data_temp_press", "温度压力"),
     DATA_WELLCOVER_LOCA("data_wellcover_loca", "井盖位置"),
     DATA_WELLPLUS("data_wellplus", "井盖和液位"),
+    DATA_H2S("data_h2s", "硫化氢"),
     DEVICE_TYPE_TABLE(new HashMap<Integer, DeviceDataTableEnum>() {{
             put(1, DATA_WELLCOVER);
             put(2, DATA_LIQUID);
@@ -38,6 +39,7 @@
             put(11, DATA_HYDRANT);
             put(12, DATA_TUBE);
             put(13, DATA_WELLPLUS);
+            put(14, DATA_H2S);
             put(21, DATA_PANTILT);
             put(101, DATA_GAS_DECTOR);
         }