diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java
deleted file mode 100644
index 8af0e15..0000000
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum DeviceDataFieldTableEnum {
-
-    TABLE_FIELD(new HashMap<String, String>() {
-        {
-            put("data_dig", "UPTIME AS  lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays");
-            put("data_gas", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gasliquid_gas", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gasliquid_liquid", "liquiddata AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gas_dector", "gas_sample_value AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_hydrant", "0  AS  dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_liquid", "liquiddata  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_noise", "ddata  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_tube", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellcover", "descn AS  dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_temp_press", "press  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_pantilt", "concentration  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellcover_loca", "0  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellplus", "0  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_h2s", "strength  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_pressure", "re_val  AS  dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-        }
-    });
-    public Map<String, String> tableNameMap;
-
-    DeviceDataFieldTableEnum(Map<String, String> tableNameMap) {
-        this.tableNameMap = tableNameMap;
-    }
-
-    public Map<String, String> getTableFieldMap() {
-        return tableNameMap;
-    }
-}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java
deleted file mode 100644
index 8af0e15..0000000
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum DeviceDataFieldTableEnum {
-
-    TABLE_FIELD(new HashMap<String, String>() {
-        {
-            put("data_dig", "UPTIME AS  lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays");
-            put("data_gas", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gasliquid_gas", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gasliquid_liquid", "liquiddata AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gas_dector", "gas_sample_value AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_hydrant", "0  AS  dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_liquid", "liquiddata  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_noise", "ddata  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_tube", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellcover", "descn AS  dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_temp_press", "press  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_pantilt", "concentration  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellcover_loca", "0  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellplus", "0  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_h2s", "strength  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_pressure", "re_val  AS  dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-        }
-    });
-    public Map<String, String> tableNameMap;
-
-    DeviceDataFieldTableEnum(Map<String, String> tableNameMap) {
-        this.tableNameMap = tableNameMap;
-    }
-
-    public Map<String, String> getTableFieldMap() {
-        return tableNameMap;
-    }
-}
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 48dd143..4279f7b 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
@@ -1267,7 +1267,7 @@
 
     <select id="getHydrantlist" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HydrantDataDto">
         SELECT bd.DEVCODE AS devcode,bd.DEVICE_TYPE AS deviceType,bdt.TYPE_NAME AS
-        "deviceTypeName",bwi.deptid,dh.WELL_CODE AS "wellCode",
+        "deviceTypeName",bwi.deptid,bwi.WELL_CODE AS "wellCode",
         dh.STATUS AS "status",
         <include refid="date_toChar">
             <property name="paramTime" value="dh.LOGTIME"/>
@@ -1299,6 +1299,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER BY dh.UPTIME  DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java
deleted file mode 100644
index 8af0e15..0000000
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum DeviceDataFieldTableEnum {
-
-    TABLE_FIELD(new HashMap<String, String>() {
-        {
-            put("data_dig", "UPTIME AS  lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays");
-            put("data_gas", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gasliquid_gas", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gasliquid_liquid", "liquiddata AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gas_dector", "gas_sample_value AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_hydrant", "0  AS  dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_liquid", "liquiddata  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_noise", "ddata  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_tube", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellcover", "descn AS  dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_temp_press", "press  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_pantilt", "concentration  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellcover_loca", "0  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellplus", "0  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_h2s", "strength  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_pressure", "re_val  AS  dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-        }
-    });
-    public Map<String, String> tableNameMap;
-
-    DeviceDataFieldTableEnum(Map<String, String> tableNameMap) {
-        this.tableNameMap = tableNameMap;
-    }
-
-    public Map<String, String> getTableFieldMap() {
-        return tableNameMap;
-    }
-}
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 48dd143..4279f7b 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
@@ -1267,7 +1267,7 @@
 
     <select id="getHydrantlist" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HydrantDataDto">
         SELECT bd.DEVCODE AS devcode,bd.DEVICE_TYPE AS deviceType,bdt.TYPE_NAME AS
-        "deviceTypeName",bwi.deptid,dh.WELL_CODE AS "wellCode",
+        "deviceTypeName",bwi.deptid,bwi.WELL_CODE AS "wellCode",
         dh.STATUS AS "status",
         <include refid="date_toChar">
             <property name="paramTime" value="dh.LOGTIME"/>
@@ -1299,6 +1299,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER BY dh.UPTIME  DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index a1c749a..f06a67b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -736,6 +736,38 @@
 
 
     /**
+     * 硫化氢配置列表
+     */
+    @RequestMapping(value = "/liquidGasConfig/batchExport")
+    @ResponseBody
+    public Object liquidGasConfigBatchExport(@RequestParam(required = false) String keywords,
+                                             @RequestParam(required = false) String deptid,
+                                             HttpServletResponse response) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            //page使用
+            Page<BusConfigDTO> page = PageFactory.defaultPage();
+            page.setCurrent(1);
+            page.setSearchCount(false);
+            page.setSize(Integer.MAX_VALUE);
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            busNoiseConfigService.exp(busConfigDTOList, response);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+
+    }
+
+
+    /**
      * 新增燃气液位一体化配置
      */
     @RequestMapping(value = "/liquidGasConfig/config")
@@ -777,13 +809,14 @@
         return resultData;
     }
 
+
     /**
      * 硫化氢配置列表
      */
     @RequestMapping(value = "/H2sConfig/list")
     @ResponseBody
     public Object H2sConfig(@RequestParam(required = false) String keywords,
-                                      @RequestParam(required = false) String deptid) {
+                            @RequestParam(required = false) String deptid) {
         SuccessResponseData successResult = new SuccessResponseData();
         try {
             //page使用
@@ -801,13 +834,14 @@
         }
         return successResult;
     }
+
     /**
      * 硫化氢配置列表
      */
     @RequestMapping(value = "/H2sConfig/batchImport")
     @ResponseBody
     public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords,
-                            @RequestParam(required = false) String deptid) {
+                                       @RequestParam(required = false) String deptid) {
         SuccessResponseData successResult = new SuccessResponseData();
         try {
             //page使用
@@ -832,7 +866,8 @@
     @RequestMapping(value = "/H2sConfig/batchExport")
     @ResponseBody
     public Object H2sConfigBatchExport(@RequestParam(required = false) String keywords,
-                                  @RequestParam(required = false) String deptid) {
+                                       @RequestParam(required = false) String deptid,
+                                       HttpServletResponse response) {
         SuccessResponseData successResult = new SuccessResponseData();
         try {
             //page使用
@@ -840,6 +875,7 @@
             DataScope dataScope = service.getAuthService().getLoginUserDataScope();
             List<BusConfigDTO> busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords,
                     deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope);
+            busNoiseConfigService.exp(busConfigDTOList, response);
             page.setRecords(busConfigDTOList);
             successResult.setData(super.packForBT(page));
             successResult.setMessage("success");
@@ -858,7 +894,7 @@
     @RequestMapping(value = "/H2sConfig/config")
     @ResponseBody
     public Object H2sConfigCommand(@RequestParam(required = false) String keywords,
-                                       @RequestParam(required = false) String deptid) {
+                                   @RequestParam(required = false) String deptid) {
         SuccessResponseData successResult = new SuccessResponseData();
         try {
             //page使用

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java
deleted file mode 100644
index 8af0e15..0000000
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/DeviceDataFieldTableEnum.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.casic.missiles.modular.system.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum DeviceDataFieldTableEnum {
-
-    TABLE_FIELD(new HashMap<String, String>() {
-        {
-            put("data_dig", "UPTIME AS  lastDataTs,timestampdiff(DAY,bds.last_data_ts,now()) AS offlineDays");
-            put("data_gas", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gasliquid_gas", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gasliquid_liquid", "liquiddata AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_gas_dector", "gas_sample_value AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_harmful_gas", "CONCAT(CO, ', ', CH4, ', ', H2S, ', ', O2) AS dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_hydrant", "0  AS  dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_liquid", "liquiddata  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_noise", "ddata  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_temp_hum", "CONCAT(TEMPERATURE, ', ', HUMIDITY) AS dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_tube", "strength AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellcover", "descn AS  dataValue,devcode AS devcode,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_temp_press", "press  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_pantilt", "concentration  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellcover_loca", "0  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_wellplus", "0  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_h2s", "strength  AS  dataValue,devcode AS devcode,CELL AS cell,DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-            put("data_pressure", "re_val  AS  dataValue,devcode AS devcode,'' AS cell,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%s') AS uptime");
-        }
-    });
-    public Map<String, String> tableNameMap;
-
-    DeviceDataFieldTableEnum(Map<String, String> tableNameMap) {
-        this.tableNameMap = tableNameMap;
-    }
-
-    public Map<String, String> getTableFieldMap() {
-        return tableNameMap;
-    }
-}
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 48dd143..4279f7b 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
@@ -1267,7 +1267,7 @@
 
     <select id="getHydrantlist" resultType="com.casic.missiles.modular.system.dto.ExcelModel.HydrantDataDto">
         SELECT bd.DEVCODE AS devcode,bd.DEVICE_TYPE AS deviceType,bdt.TYPE_NAME AS
-        "deviceTypeName",bwi.deptid,dh.WELL_CODE AS "wellCode",
+        "deviceTypeName",bwi.deptid,bwi.WELL_CODE AS "wellCode",
         dh.STATUS AS "status",
         <include refid="date_toChar">
             <property name="paramTime" value="dh.LOGTIME"/>
@@ -1299,6 +1299,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
+        ORDER BY dh.UPTIME  DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index a1c749a..f06a67b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -736,6 +736,38 @@
 
 
     /**
+     * 硫化氢配置列表
+     */
+    @RequestMapping(value = "/liquidGasConfig/batchExport")
+    @ResponseBody
+    public Object liquidGasConfigBatchExport(@RequestParam(required = false) String keywords,
+                                             @RequestParam(required = false) String deptid,
+                                             HttpServletResponse response) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            //page使用
+            Page<BusConfigDTO> page = PageFactory.defaultPage();
+            page.setCurrent(1);
+            page.setSearchCount(false);
+            page.setSize(Integer.MAX_VALUE);
+            DataScope dataScope = service.getAuthService().getLoginUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope);
+            busNoiseConfigService.exp(busConfigDTOList, response);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+
+    }
+
+
+    /**
      * 新增燃气液位一体化配置
      */
     @RequestMapping(value = "/liquidGasConfig/config")
@@ -777,13 +809,14 @@
         return resultData;
     }
 
+
     /**
      * 硫化氢配置列表
      */
     @RequestMapping(value = "/H2sConfig/list")
     @ResponseBody
     public Object H2sConfig(@RequestParam(required = false) String keywords,
-                                      @RequestParam(required = false) String deptid) {
+                            @RequestParam(required = false) String deptid) {
         SuccessResponseData successResult = new SuccessResponseData();
         try {
             //page使用
@@ -801,13 +834,14 @@
         }
         return successResult;
     }
+
     /**
      * 硫化氢配置列表
      */
     @RequestMapping(value = "/H2sConfig/batchImport")
     @ResponseBody
     public Object H2sConfigBatchImport(@RequestParam(required = false) String keywords,
-                            @RequestParam(required = false) String deptid) {
+                                       @RequestParam(required = false) String deptid) {
         SuccessResponseData successResult = new SuccessResponseData();
         try {
             //page使用
@@ -832,7 +866,8 @@
     @RequestMapping(value = "/H2sConfig/batchExport")
     @ResponseBody
     public Object H2sConfigBatchExport(@RequestParam(required = false) String keywords,
-                                  @RequestParam(required = false) String deptid) {
+                                       @RequestParam(required = false) String deptid,
+                                       HttpServletResponse response) {
         SuccessResponseData successResult = new SuccessResponseData();
         try {
             //page使用
@@ -840,6 +875,7 @@
             DataScope dataScope = service.getAuthService().getLoginUserDataScope();
             List<BusConfigDTO> busConfigDTOList = busH2sConfigServiceImpl.getConfigList(page, keywords,
                     deptid, Long.valueOf(DeviceTypeEnum.H2s.getIndex()), dataScope);
+            busNoiseConfigService.exp(busConfigDTOList, response);
             page.setRecords(busConfigDTOList);
             successResult.setData(super.packForBT(page));
             successResult.setMessage("success");
@@ -858,7 +894,7 @@
     @RequestMapping(value = "/H2sConfig/config")
     @ResponseBody
     public Object H2sConfigCommand(@RequestParam(required = false) String keywords,
-                                       @RequestParam(required = false) String deptid) {
+                                   @RequestParam(required = false) String deptid) {
         SuccessResponseData successResult = new SuccessResponseData();
         try {
             //page使用
diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml
index 16e6332..42d34b6 100644
--- a/casic-web/src/main/resources/config/application-postgre.yml
+++ b/casic-web/src/main/resources/config/application-postgre.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
+    url: jdbc:postgresql://111.198.10.15:11209/smartwell
     username: postgres
     password: Casic203
   session: