diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0c8309b..0b99b60 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -72,7 +72,7 @@
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
@@ -92,9 +92,9 @@
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0c8309b..0b99b60 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -72,7 +72,7 @@
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
@@ -92,9 +92,9 @@
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
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 7071ced..c586d01 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
@@ -289,7 +289,7 @@
     </select>
 
     <select id="selectLiquidDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.LiquidDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT DEVCODE,
         DEVICETYPE,
@@ -339,7 +339,7 @@
     </select>
 
     <select id="selectGasLiquidDataLiquidScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
@@ -356,7 +356,7 @@
             <property name="paramTime" value="glview.LOGTIME"/>
         </include>
         AS logtime,
-        glview.LIQUIDDATA AS data
+        glview.LIQUIDDATA AS strength
         FROM
         data_gasliquid_liquid glview
         LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
@@ -1229,7 +1229,7 @@
     </select>
 
     <select id="selectGasLiquidDataGasScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0c8309b..0b99b60 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -72,7 +72,7 @@
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
@@ -92,9 +92,9 @@
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
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 7071ced..c586d01 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
@@ -289,7 +289,7 @@
     </select>
 
     <select id="selectLiquidDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.LiquidDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT DEVCODE,
         DEVICETYPE,
@@ -339,7 +339,7 @@
     </select>
 
     <select id="selectGasLiquidDataLiquidScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
@@ -356,7 +356,7 @@
             <property name="paramTime" value="glview.LOGTIME"/>
         </include>
         AS logtime,
-        glview.LIQUIDDATA AS data
+        glview.LIQUIDDATA AS strength
         FROM
         data_gasliquid_liquid glview
         LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
@@ -1229,7 +1229,7 @@
     </select>
 
     <select id="selectGasLiquidDataGasScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
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 b92423a..5b2b89e 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
@@ -197,7 +197,7 @@
         dl.WELL_CODE as "wellCode"
         FROM data_liquid dl
         JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        JOIN bus_device_well bdw ON bdw.device_id=bwi.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi on bdw.well_id = bwi.id
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0c8309b..0b99b60 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -72,7 +72,7 @@
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
@@ -92,9 +92,9 @@
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
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 7071ced..c586d01 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
@@ -289,7 +289,7 @@
     </select>
 
     <select id="selectLiquidDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.LiquidDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT DEVCODE,
         DEVICETYPE,
@@ -339,7 +339,7 @@
     </select>
 
     <select id="selectGasLiquidDataLiquidScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
@@ -356,7 +356,7 @@
             <property name="paramTime" value="glview.LOGTIME"/>
         </include>
         AS logtime,
-        glview.LIQUIDDATA AS data
+        glview.LIQUIDDATA AS strength
         FROM
         data_gasliquid_liquid glview
         LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
@@ -1229,7 +1229,7 @@
     </select>
 
     <select id="selectGasLiquidDataGasScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
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 b92423a..5b2b89e 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
@@ -197,7 +197,7 @@
         dl.WELL_CODE as "wellCode"
         FROM data_liquid dl
         JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        JOIN bus_device_well bdw ON bdw.device_id=bwi.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi on bdw.well_id = bwi.id
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a75ed02..9265caa 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -75,7 +75,7 @@
      * @param keywords
      * @return
      */
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
@@ -120,7 +120,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0c8309b..0b99b60 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -72,7 +72,7 @@
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
@@ -92,9 +92,9 @@
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
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 7071ced..c586d01 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
@@ -289,7 +289,7 @@
     </select>
 
     <select id="selectLiquidDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.LiquidDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT DEVCODE,
         DEVICETYPE,
@@ -339,7 +339,7 @@
     </select>
 
     <select id="selectGasLiquidDataLiquidScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
@@ -356,7 +356,7 @@
             <property name="paramTime" value="glview.LOGTIME"/>
         </include>
         AS logtime,
-        glview.LIQUIDDATA AS data
+        glview.LIQUIDDATA AS strength
         FROM
         data_gasliquid_liquid glview
         LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
@@ -1229,7 +1229,7 @@
     </select>
 
     <select id="selectGasLiquidDataGasScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
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 b92423a..5b2b89e 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
@@ -197,7 +197,7 @@
         dl.WELL_CODE as "wellCode"
         FROM data_liquid dl
         JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        JOIN bus_device_well bdw ON bdw.device_id=bwi.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi on bdw.well_id = bwi.id
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a75ed02..9265caa 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -75,7 +75,7 @@
      * @param keywords
      * @return
      */
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
@@ -120,7 +120,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 0309f59..ad74c38 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -489,7 +489,7 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
@@ -549,13 +549,13 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
             deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0c8309b..0b99b60 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -72,7 +72,7 @@
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
@@ -92,9 +92,9 @@
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
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 7071ced..c586d01 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
@@ -289,7 +289,7 @@
     </select>
 
     <select id="selectLiquidDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.LiquidDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT DEVCODE,
         DEVICETYPE,
@@ -339,7 +339,7 @@
     </select>
 
     <select id="selectGasLiquidDataLiquidScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
@@ -356,7 +356,7 @@
             <property name="paramTime" value="glview.LOGTIME"/>
         </include>
         AS logtime,
-        glview.LIQUIDDATA AS data
+        glview.LIQUIDDATA AS strength
         FROM
         data_gasliquid_liquid glview
         LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
@@ -1229,7 +1229,7 @@
     </select>
 
     <select id="selectGasLiquidDataGasScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
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 b92423a..5b2b89e 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
@@ -197,7 +197,7 @@
         dl.WELL_CODE as "wellCode"
         FROM data_liquid dl
         JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        JOIN bus_device_well bdw ON bdw.device_id=bwi.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi on bdw.well_id = bwi.id
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a75ed02..9265caa 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -75,7 +75,7 @@
      * @param keywords
      * @return
      */
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
@@ -120,7 +120,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 0309f59..ad74c38 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -489,7 +489,7 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
@@ -549,13 +549,13 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
             deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
index a97054c..227e80b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
@@ -19,11 +19,9 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import com.casic.missiles.modular.system.util.Utility;
-import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0c8309b..0b99b60 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -72,7 +72,7 @@
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
@@ -92,9 +92,9 @@
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
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 7071ced..c586d01 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
@@ -289,7 +289,7 @@
     </select>
 
     <select id="selectLiquidDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.LiquidDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT DEVCODE,
         DEVICETYPE,
@@ -339,7 +339,7 @@
     </select>
 
     <select id="selectGasLiquidDataLiquidScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
@@ -356,7 +356,7 @@
             <property name="paramTime" value="glview.LOGTIME"/>
         </include>
         AS logtime,
-        glview.LIQUIDDATA AS data
+        glview.LIQUIDDATA AS strength
         FROM
         data_gasliquid_liquid glview
         LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
@@ -1229,7 +1229,7 @@
     </select>
 
     <select id="selectGasLiquidDataGasScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
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 b92423a..5b2b89e 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
@@ -197,7 +197,7 @@
         dl.WELL_CODE as "wellCode"
         FROM data_liquid dl
         JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        JOIN bus_device_well bdw ON bdw.device_id=bwi.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi on bdw.well_id = bwi.id
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a75ed02..9265caa 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -75,7 +75,7 @@
      * @param keywords
      * @return
      */
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
@@ -120,7 +120,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 0309f59..ad74c38 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -489,7 +489,7 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
@@ -549,13 +549,13 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
             deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
index a97054c..227e80b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
@@ -19,11 +19,9 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import com.casic.missiles.modular.system.util.Utility;
-import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index 9c3a4c3..2764d4a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -11,7 +11,7 @@
 import lombok.NoArgsConstructor;
 
 /**
- * 气体和液体的导出内容
+ * 气体导出内容
  */
 @ColumnWidth(30)
 @HeadRowHeight(15)
@@ -51,6 +51,6 @@
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
-    private String data;
+    private String strength;
     private String logtime;
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0c8309b..0b99b60 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -72,7 +72,7 @@
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
@@ -92,9 +92,9 @@
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
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 7071ced..c586d01 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
@@ -289,7 +289,7 @@
     </select>
 
     <select id="selectLiquidDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.LiquidDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT DEVCODE,
         DEVICETYPE,
@@ -339,7 +339,7 @@
     </select>
 
     <select id="selectGasLiquidDataLiquidScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
@@ -356,7 +356,7 @@
             <property name="paramTime" value="glview.LOGTIME"/>
         </include>
         AS logtime,
-        glview.LIQUIDDATA AS data
+        glview.LIQUIDDATA AS strength
         FROM
         data_gasliquid_liquid glview
         LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
@@ -1229,7 +1229,7 @@
     </select>
 
     <select id="selectGasLiquidDataGasScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
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 b92423a..5b2b89e 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
@@ -197,7 +197,7 @@
         dl.WELL_CODE as "wellCode"
         FROM data_liquid dl
         JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        JOIN bus_device_well bdw ON bdw.device_id=bwi.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi on bdw.well_id = bwi.id
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a75ed02..9265caa 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -75,7 +75,7 @@
      * @param keywords
      * @return
      */
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
@@ -120,7 +120,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 0309f59..ad74c38 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -489,7 +489,7 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
@@ -549,13 +549,13 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
             deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
index a97054c..227e80b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
@@ -19,11 +19,9 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import com.casic.missiles.modular.system.util.Utility;
-import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index 9c3a4c3..2764d4a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -11,7 +11,7 @@
 import lombok.NoArgsConstructor;
 
 /**
- * 气体和液体的导出内容
+ * 气体导出内容
  */
 @ColumnWidth(30)
 @HeadRowHeight(15)
@@ -51,6 +51,6 @@
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
-    private String data;
+    private String strength;
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
new file mode 100644
index 0000000..664f695
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class GasLiquidDataExcelDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String data;
+    private String logtime;
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0c8309b..0b99b60 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -72,7 +72,7 @@
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
@@ -92,9 +92,9 @@
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
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 7071ced..c586d01 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
@@ -289,7 +289,7 @@
     </select>
 
     <select id="selectLiquidDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.LiquidDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT DEVCODE,
         DEVICETYPE,
@@ -339,7 +339,7 @@
     </select>
 
     <select id="selectGasLiquidDataLiquidScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
@@ -356,7 +356,7 @@
             <property name="paramTime" value="glview.LOGTIME"/>
         </include>
         AS logtime,
-        glview.LIQUIDDATA AS data
+        glview.LIQUIDDATA AS strength
         FROM
         data_gasliquid_liquid glview
         LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
@@ -1229,7 +1229,7 @@
     </select>
 
     <select id="selectGasLiquidDataGasScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
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 b92423a..5b2b89e 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
@@ -197,7 +197,7 @@
         dl.WELL_CODE as "wellCode"
         FROM data_liquid dl
         JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        JOIN bus_device_well bdw ON bdw.device_id=bwi.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi on bdw.well_id = bwi.id
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a75ed02..9265caa 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -75,7 +75,7 @@
      * @param keywords
      * @return
      */
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
@@ -120,7 +120,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 0309f59..ad74c38 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -489,7 +489,7 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
@@ -549,13 +549,13 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
             deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
index a97054c..227e80b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
@@ -19,11 +19,9 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import com.casic.missiles.modular.system.util.Utility;
-import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index 9c3a4c3..2764d4a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -11,7 +11,7 @@
 import lombok.NoArgsConstructor;
 
 /**
- * 气体和液体的导出内容
+ * 气体导出内容
  */
 @ColumnWidth(30)
 @HeadRowHeight(15)
@@ -51,6 +51,6 @@
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
-    private String data;
+    private String strength;
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
new file mode 100644
index 0000000..664f695
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class GasLiquidDataExcelDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String data;
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
new file mode 100644
index 0000000..df48c25
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class LiquidDataExcelDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String liquiddata;
+    private String logtime;
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0c8309b..0b99b60 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -72,7 +72,7 @@
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
@@ -92,9 +92,9 @@
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
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 7071ced..c586d01 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
@@ -289,7 +289,7 @@
     </select>
 
     <select id="selectLiquidDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.LiquidDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT DEVCODE,
         DEVICETYPE,
@@ -339,7 +339,7 @@
     </select>
 
     <select id="selectGasLiquidDataLiquidScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
@@ -356,7 +356,7 @@
             <property name="paramTime" value="glview.LOGTIME"/>
         </include>
         AS logtime,
-        glview.LIQUIDDATA AS data
+        glview.LIQUIDDATA AS strength
         FROM
         data_gasliquid_liquid glview
         LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
@@ -1229,7 +1229,7 @@
     </select>
 
     <select id="selectGasLiquidDataGasScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
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 b92423a..5b2b89e 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
@@ -197,7 +197,7 @@
         dl.WELL_CODE as "wellCode"
         FROM data_liquid dl
         JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        JOIN bus_device_well bdw ON bdw.device_id=bwi.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi on bdw.well_id = bwi.id
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a75ed02..9265caa 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -75,7 +75,7 @@
      * @param keywords
      * @return
      */
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
@@ -120,7 +120,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 0309f59..ad74c38 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -489,7 +489,7 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
@@ -549,13 +549,13 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
             deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
index a97054c..227e80b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
@@ -19,11 +19,9 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import com.casic.missiles.modular.system.util.Utility;
-import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index 9c3a4c3..2764d4a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -11,7 +11,7 @@
 import lombok.NoArgsConstructor;
 
 /**
- * 气体和液体的导出内容
+ * 气体导出内容
  */
 @ColumnWidth(30)
 @HeadRowHeight(15)
@@ -51,6 +51,6 @@
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
-    private String data;
+    private String strength;
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
new file mode 100644
index 0000000..664f695
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class GasLiquidDataExcelDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String data;
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
new file mode 100644
index 0000000..df48c25
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class LiquidDataExcelDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String liquiddata;
+    private String logtime;
+}
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 6e69581..fdabbf2 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+    url: jdbc:mysql://111.198.10.15:11336/smartwell_demo?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
   redis:

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 439d184..9c60e79 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -138,6 +138,11 @@
             map.replace("alarmValue", "--");
         }
 
+        // 告警值
+        if (alarmContentNameStr.contains("消防栓") || "2".equals(alarmTypeStr)) {
+            map.replace("alarmValue", "--");
+        }
+
         // 告警状态
         String statusStr = map.get("status").toString();
         map.put("statusName", EhcacheConstant.retBean().getDictNameByCodeCodeNum(statusStr, "alarmStatus"));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 593ec5f..a9ced11 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -63,7 +63,7 @@
     <select id="alarmList" resultType="map">
         SELECT
         ar.ID as id,
-        ar.WELL_CODE as "wellCode",
+        bwi.WELL_CODE as "wellCode",
         ar.ALARM_CONTENT as "alarmContentName",
         ar.DEVICE_ID as "deviceId",
         <include refid="date_toChar">
@@ -82,14 +82,14 @@
         FROM alarm_records ar
         JOIN bus_device_well rdv ON ar.DEVICE_ID = rdv.DEVICE_ID
         JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN bus_well_info bwi  ON  rdv.well_id = bwi.ID
         WHERE rdv.VALID='1'
 
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like
+            and bwi.WELL_CODE like
             <include refid="keywords_sql"/>
         </if>
         <if test="alarmType!='' and alarmType!= null">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 8a494a9..0b75d14 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -91,7 +91,7 @@
      */
     @GetMapping(value = "/liquiddata/list-page")
     public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         if (CollectionUtil.isEmpty(page.orders())) {
             OrderItem orderItem = new OrderItem();
             orderItem.setColumn("UPTIME");
@@ -100,7 +100,7 @@
         }
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -121,17 +121,17 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<LiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
+        List<LiquidDataExcelDto> deviceDataDtoList = deviceService.selectLiquidDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords);
         deviceDataDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
+        super.exportExcel(LiquidDataExcelDto.class, deviceDataDtoList, DeviceExportEnum.LIQUIDDATA_EXPORT.getFileName());
     }
 
     @GetMapping(value = "/gasdata/list-page")
@@ -527,9 +527,9 @@
      */
     @GetMapping(value = "/liquidGasData/list-page")
     public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -550,16 +550,16 @@
      */
     @GetMapping(value = "/liquidGasData/export")
     public void liquidGasDataExport(HttpServletResponse response, String keywords, String deptid, String sensorType, String beginTime, String endTime) throws IOException {
-        Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
+        Page<GasLiquidDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
 
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getDeptName());
                         if (dValue <= 20.0) {
                             deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
@@ -575,7 +575,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         //TODO 导出表头设置
-        super.exportExcel(DeviceDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
+        super.exportExcel(GasLiquidDataExcelDto.class, deviceDataExcelDtoList, DeviceExportEnum.LIQUIDGASDATA_EXPORT.getFileName());
     }
 
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
index 0c8309b..0b99b60 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java
@@ -72,7 +72,7 @@
 
     List<WellCoverDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<WellCoverDataDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<LiquidDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<DeviceDataExcelDto> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
@@ -92,9 +92,9 @@
 
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(@Param("deviceType") Long deviceType, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("dataScope") DataScope dataScope, @Param("deptid") Long deptid, @Param("searchCurr") Boolean searchCurr);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataLiquidScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataGasScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<GasLiquidDataExcelDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectLiquidDataList(@Param("dataScope") DataScope dataScope, @Param("wellCode") String wellCode, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
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 7071ced..c586d01 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
@@ -289,7 +289,7 @@
     </select>
 
     <select id="selectLiquidDataScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.LiquidDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT DEVCODE,
         DEVICETYPE,
@@ -339,7 +339,7 @@
     </select>
 
     <select id="selectGasLiquidDataLiquidScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
@@ -356,7 +356,7 @@
             <property name="paramTime" value="glview.LOGTIME"/>
         </include>
         AS logtime,
-        glview.LIQUIDDATA AS data
+        glview.LIQUIDDATA AS strength
         FROM
         data_gasliquid_liquid glview
         LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE
@@ -1229,7 +1229,7 @@
     </select>
 
     <select id="selectGasLiquidDataGasScopePage"
-            resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
+            resultType="com.casic.missiles.modular.system.dto.ExcelModel.GasLiquidDataExcelDto">
         SELECT
         glview.DEVCODE AS devcode ,
         bd.DEVICE_TYPE AS "deviceType",
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 b92423a..5b2b89e 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
@@ -197,7 +197,7 @@
         dl.WELL_CODE as "wellCode"
         FROM data_liquid dl
         JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
-        JOIN bus_device_well bdw ON bdw.device_id=bwi.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi on bdw.well_id = bwi.id
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
index a75ed02..9265caa 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java
@@ -75,7 +75,7 @@
      * @param keywords
      * @return
      */
-    List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
+    List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords);
     /**
      * 燃气数据查询
      */
@@ -120,7 +120,7 @@
      */
     List<AlarmDeptStaticsDto> alarmsStaticsByDept(Long deviceType, String beginTime, String endTime, DataScope dataScope, Long deptId);
 
-    List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
+    List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords);
 
     List<Map<String, Object>> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime);
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index 0309f59..ad74c38 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -489,7 +489,7 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
+    public List<LiquidDataExcelDto> selectLiquidDataScopePage(DataScope dataScope, Page<LiquidDataExcelDto> page, String deptid, String beginTime, String endTime, String keywords) {
         return this.baseMapper.selectLiquidDataScopePage(dataScope, page, StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid), beginTime, endTime, keywords);
     }
 
@@ -549,13 +549,13 @@
     }
 
     @Override
-    public List<DeviceDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<DeviceDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
+    public List<GasLiquidDataExcelDto> selectGasLiquidDataScopePage(DataScope dataScope, Page<GasLiquidDataExcelDto> page, String sensorType, String deptid, String beginTime, String endTime, String keywords) {
         List<Long> deptIds = null;
         if (StrUtil.isNotEmpty(deptid)) {
             deptIds = permissionService.getDeptService().getIdsByPid(deptid, null);
             deptIds.add(Long.valueOf(deptid));
         }
-        List<DeviceDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
+        List<GasLiquidDataExcelDto> deviceDataExcelDtoList = new ArrayList<>();
         if ("liquid".equals(sensorType)) {
             deviceDataExcelDtoList = this.baseMapper.selectGasLiquidDataLiquidScopePage(dataScope, page, deptIds, beginTime, endTime, keywords);
         }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
index a97054c..227e80b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java
@@ -19,11 +19,9 @@
 import com.casic.missiles.modular.system.model.Device;
 import com.casic.missiles.modular.system.service.IBusConcentratorService;
 import com.casic.missiles.modular.system.util.Utility;
-import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BeanPropertyBindingResult;
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index 9c3a4c3..2764d4a 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -11,7 +11,7 @@
 import lombok.NoArgsConstructor;
 
 /**
- * 气体和液体的导出内容
+ * 气体导出内容
  */
 @ColumnWidth(30)
 @HeadRowHeight(15)
@@ -51,6 +51,6 @@
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
-    private String data;
+    private String strength;
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
new file mode 100644
index 0000000..664f695
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/GasLiquidDataExcelDto.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 气体和液体的导出内容
+ */
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class GasLiquidDataExcelDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String data;
+    private String logtime;
+}
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
new file mode 100644
index 0000000..df48c25
--- /dev/null
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/LiquidDataExcelDto.java
@@ -0,0 +1,40 @@
+package com.casic.missiles.modular.system.dto.ExcelModel;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@Data
+@ExcelIgnoreUnannotated
+@NoArgsConstructor
+public class LiquidDataExcelDto {
+    @ExcelProperty("设备编号")
+    private String devcode;
+    private Long deviceType;
+    @ExcelProperty("设备类型名称")
+    private String deviceTypeName;
+    private Long deptid;
+    @ExcelProperty("部门名称")
+    private String deptName;
+    @ExcelProperty("点位编号")
+    private String wellCode;
+    private String descn;
+    @ExcelProperty("采集时间")
+    private String uptime;
+    @ExcelProperty("电量")
+    private String cell;
+    @ExcelProperty("设备数据值")
+    private String liquiddata;
+    private String logtime;
+}
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 6e69581..fdabbf2 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+    url: jdbc:mysql://111.198.10.15:11336/smartwell_demo?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
   redis:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index dd4a310..9828b69 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: postgre
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB