diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index f889a9e..74f9317 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -60,7 +60,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'in' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -70,7 +69,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'out' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -81,7 +79,6 @@
             "   st.TYPE, " +
             "   st.press_type, " +
             "   st.value, " +
-            "   st.updt_time AS logTime, " +
             "   st.flag, " +
             "   bl.LNG_GAODE, " +
             "   bl.LAT_GAODE  " +
@@ -89,6 +86,6 @@
             "   station_temp st " +
             "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
             "   where  bl.valid = '1'  " +
-            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null and st.value is not null")
     List<StationDTO> dataStation();
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index f889a9e..74f9317 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -60,7 +60,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'in' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -70,7 +69,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'out' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -81,7 +79,6 @@
             "   st.TYPE, " +
             "   st.press_type, " +
             "   st.value, " +
-            "   st.updt_time AS logTime, " +
             "   st.flag, " +
             "   bl.LNG_GAODE, " +
             "   bl.LAT_GAODE  " +
@@ -89,6 +86,6 @@
             "   station_temp st " +
             "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
             "   where  bl.valid = '1'  " +
-            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null and st.value is not null")
     List<StationDTO> dataStation();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
index 6fbe699..d81fa40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
@@ -8,6 +8,8 @@
 
     private String deviceType;
 
+    private String devcode;
+
     private String onlineState;
 
     private String monitorType;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index f889a9e..74f9317 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -60,7 +60,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'in' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -70,7 +69,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'out' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -81,7 +79,6 @@
             "   st.TYPE, " +
             "   st.press_type, " +
             "   st.value, " +
-            "   st.updt_time AS logTime, " +
             "   st.flag, " +
             "   bl.LNG_GAODE, " +
             "   bl.LAT_GAODE  " +
@@ -89,6 +86,6 @@
             "   station_temp st " +
             "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
             "   where  bl.valid = '1'  " +
-            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null and st.value is not null")
     List<StationDTO> dataStation();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
index 6fbe699..d81fa40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
@@ -8,6 +8,8 @@
 
     private String deviceType;
 
+    private String devcode;
+
     private String onlineState;
 
     private String monitorType;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 175b52d..c8d66e4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -76,7 +76,7 @@
                     //泄漏
                     if (ObjectUtil.isNotEmpty(deviceTypeDTO.getWatchType()) && deviceTypeDTO.getWatchType().contains(DictEnum.WATCH_TYPE_1)) {
                         leakTotalCount++;
-                        if (DictEnum.DEVICE_OFFLINE.equals(monitorDTO.getOnlineState())) {
+                        if (DictEnum.DEVICE_OFFLINE.equals(monitorDTO.getOnlineState())&&monitorDTO.getDevcode().indexOf("24")!=0) {
                             leakOffCount++;
                         } else if (DictEnum.DEVICE_ALARM.equals(monitorDTO.getOnlineState())) {
                             leakAlarmCount++;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index f889a9e..74f9317 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -60,7 +60,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'in' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -70,7 +69,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'out' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -81,7 +79,6 @@
             "   st.TYPE, " +
             "   st.press_type, " +
             "   st.value, " +
-            "   st.updt_time AS logTime, " +
             "   st.flag, " +
             "   bl.LNG_GAODE, " +
             "   bl.LAT_GAODE  " +
@@ -89,6 +86,6 @@
             "   station_temp st " +
             "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
             "   where  bl.valid = '1'  " +
-            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null and st.value is not null")
     List<StationDTO> dataStation();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
index 6fbe699..d81fa40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
@@ -8,6 +8,8 @@
 
     private String deviceType;
 
+    private String devcode;
+
     private String onlineState;
 
     private String monitorType;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 175b52d..c8d66e4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -76,7 +76,7 @@
                     //泄漏
                     if (ObjectUtil.isNotEmpty(deviceTypeDTO.getWatchType()) && deviceTypeDTO.getWatchType().contains(DictEnum.WATCH_TYPE_1)) {
                         leakTotalCount++;
-                        if (DictEnum.DEVICE_OFFLINE.equals(monitorDTO.getOnlineState())) {
+                        if (DictEnum.DEVICE_OFFLINE.equals(monitorDTO.getOnlineState())&&monitorDTO.getDevcode().indexOf("24")!=0) {
                             leakOffCount++;
                         } else if (DictEnum.DEVICE_ALARM.equals(monitorDTO.getOnlineState())) {
                             leakAlarmCount++;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index e5b07c1..f3e2991 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -334,7 +334,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), CH4L.concat(",").concat(CH4R), ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index f889a9e..74f9317 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -60,7 +60,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'in' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -70,7 +69,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'out' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -81,7 +79,6 @@
             "   st.TYPE, " +
             "   st.press_type, " +
             "   st.value, " +
-            "   st.updt_time AS logTime, " +
             "   st.flag, " +
             "   bl.LNG_GAODE, " +
             "   bl.LAT_GAODE  " +
@@ -89,6 +86,6 @@
             "   station_temp st " +
             "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
             "   where  bl.valid = '1'  " +
-            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null and st.value is not null")
     List<StationDTO> dataStation();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
index 6fbe699..d81fa40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
@@ -8,6 +8,8 @@
 
     private String deviceType;
 
+    private String devcode;
+
     private String onlineState;
 
     private String monitorType;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 175b52d..c8d66e4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -76,7 +76,7 @@
                     //泄漏
                     if (ObjectUtil.isNotEmpty(deviceTypeDTO.getWatchType()) && deviceTypeDTO.getWatchType().contains(DictEnum.WATCH_TYPE_1)) {
                         leakTotalCount++;
-                        if (DictEnum.DEVICE_OFFLINE.equals(monitorDTO.getOnlineState())) {
+                        if (DictEnum.DEVICE_OFFLINE.equals(monitorDTO.getOnlineState())&&monitorDTO.getDevcode().indexOf("24")!=0) {
                             leakOffCount++;
                         } else if (DictEnum.DEVICE_ALARM.equals(monitorDTO.getOnlineState())) {
                             leakAlarmCount++;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index e5b07c1..f3e2991 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -334,7 +334,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), CH4L.concat(",").concat(CH4R), ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
index 7fd7d9a..20c55ee 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
@@ -45,8 +45,8 @@
 
 //    @ApiModelProperty("出站压力")
 //    private String outPress;
-    @ApiModelProperty("上传时间")
-    private Date logTime;
+//    @ApiModelProperty("上传时间")
+//    private Date logTime;
 
     private String flag;
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index f889a9e..74f9317 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -60,7 +60,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'in' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -70,7 +69,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'out' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -81,7 +79,6 @@
             "   st.TYPE, " +
             "   st.press_type, " +
             "   st.value, " +
-            "   st.updt_time AS logTime, " +
             "   st.flag, " +
             "   bl.LNG_GAODE, " +
             "   bl.LAT_GAODE  " +
@@ -89,6 +86,6 @@
             "   station_temp st " +
             "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
             "   where  bl.valid = '1'  " +
-            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null and st.value is not null")
     List<StationDTO> dataStation();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
index 6fbe699..d81fa40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
@@ -8,6 +8,8 @@
 
     private String deviceType;
 
+    private String devcode;
+
     private String onlineState;
 
     private String monitorType;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 175b52d..c8d66e4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -76,7 +76,7 @@
                     //泄漏
                     if (ObjectUtil.isNotEmpty(deviceTypeDTO.getWatchType()) && deviceTypeDTO.getWatchType().contains(DictEnum.WATCH_TYPE_1)) {
                         leakTotalCount++;
-                        if (DictEnum.DEVICE_OFFLINE.equals(monitorDTO.getOnlineState())) {
+                        if (DictEnum.DEVICE_OFFLINE.equals(monitorDTO.getOnlineState())&&monitorDTO.getDevcode().indexOf("24")!=0) {
                             leakOffCount++;
                         } else if (DictEnum.DEVICE_ALARM.equals(monitorDTO.getOnlineState())) {
                             leakAlarmCount++;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index e5b07c1..f3e2991 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -334,7 +334,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), CH4L.concat(",").concat(CH4R), ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
index 7fd7d9a..20c55ee 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
@@ -45,8 +45,8 @@
 
 //    @ApiModelProperty("出站压力")
 //    private String outPress;
-    @ApiModelProperty("上传时间")
-    private Date logTime;
+//    @ApiModelProperty("上传时间")
+//    private Date logTime;
 
     private String flag;
 
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/AlarmEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/AlarmEnum.java
index 1602daa..cb20510 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/AlarmEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/AlarmEnum.java
@@ -7,7 +7,7 @@
     Sloping("Sloping", "倾斜报警"),
     Destroy("Destroy", "破坏报警"),
     DiscL("DiscL", "左侧断线报警"),
-    Leak("Leak", "泄露报警"),
+    Leak("Leak", "泄漏报警"),
     DiscR("DiscR", "右侧断线报警"),
     VibL("VibL", "左侧振动报警"),
     VibR("VibR", "右侧振动报警"),

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index f889a9e..74f9317 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -60,7 +60,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'in' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -70,7 +69,6 @@
             "  bs.TYPE, " +
             "  bs.press_type, " +
             "  sv.value, " +
-            "  sv.updt_time, " +
             "  'out' AS 'flag'  " +
             "   FROM " +
             "  `bus_station` bs " +
@@ -81,7 +79,6 @@
             "   st.TYPE, " +
             "   st.press_type, " +
             "   st.value, " +
-            "   st.updt_time AS logTime, " +
             "   st.flag, " +
             "   bl.LNG_GAODE, " +
             "   bl.LAT_GAODE  " +
@@ -89,6 +86,6 @@
             "   station_temp st " +
             "   JOIN bus_ledger bl ON st.TAG_NUMBER = bl.TAG_NUMBER  " +
             "   where  bl.valid = '1'  " +
-            "   AND bl.type = '2' and bl.LNG_GAODE is not null")
+            "   AND bl.type = '2' and bl.LNG_GAODE is not null and st.value is not null")
     List<StationDTO> dataStation();
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
index 6fbe699..d81fa40 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/MonitorDTO.java
@@ -8,6 +8,8 @@
 
     private String deviceType;
 
+    private String devcode;
+
     private String onlineState;
 
     private String monitorType;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
index 175b52d..c8d66e4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/OverViewServiceImpl.java
@@ -76,7 +76,7 @@
                     //泄漏
                     if (ObjectUtil.isNotEmpty(deviceTypeDTO.getWatchType()) && deviceTypeDTO.getWatchType().contains(DictEnum.WATCH_TYPE_1)) {
                         leakTotalCount++;
-                        if (DictEnum.DEVICE_OFFLINE.equals(monitorDTO.getOnlineState())) {
+                        if (DictEnum.DEVICE_OFFLINE.equals(monitorDTO.getOnlineState())&&monitorDTO.getDevcode().indexOf("24")!=0) {
                             leakOffCount++;
                         } else if (DictEnum.DEVICE_ALARM.equals(monitorDTO.getOnlineState())) {
                             leakAlarmCount++;
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
index e5b07c1..f3e2991 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataMonitorPipeOtherServiceImpl.java
@@ -334,7 +334,7 @@
                     alarmRecordsService.cancelDataAlarm(devCode);
                 }
                 //6.更新电量及状态 (1:正常，2：报警)
-                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), "", ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
+                alarmRecordsService.updateCell(devCode, ObjectUtil.isNotEmpty(alarmContent) ? "2" : "1", BAT.concat("V"), CH4L.concat(",").concat(CH4R), ObjectUtil.isNotEmpty(alarmContent) ? alarmContent.substring(0, alarmContent.length() - 1) : "", logTime);
 
                 //7.更新管线状态 (1:正常，2：报警)
                 if (busWellDTOList != null && busWellDTOList.size() > 0) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
index 7fd7d9a..20c55ee 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/StationDTO.java
@@ -45,8 +45,8 @@
 
 //    @ApiModelProperty("出站压力")
 //    private String outPress;
-    @ApiModelProperty("上传时间")
-    private Date logTime;
+//    @ApiModelProperty("上传时间")
+//    private Date logTime;
 
     private String flag;
 
diff --git a/casic-public/src/main/java/com/casic/missiles/enums/AlarmEnum.java b/casic-public/src/main/java/com/casic/missiles/enums/AlarmEnum.java
index 1602daa..cb20510 100644
--- a/casic-public/src/main/java/com/casic/missiles/enums/AlarmEnum.java
+++ b/casic-public/src/main/java/com/casic/missiles/enums/AlarmEnum.java
@@ -7,7 +7,7 @@
     Sloping("Sloping", "倾斜报警"),
     Destroy("Destroy", "破坏报警"),
     DiscL("DiscL", "左侧断线报警"),
-    Leak("Leak", "泄露报警"),
+    Leak("Leak", "泄漏报警"),
     DiscR("DiscR", "右侧断线报警"),
     VibL("VibL", "左侧振动报警"),
     VibR("VibR", "右侧振动报警"),
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 02db5ea..425ab6d 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,12 +4,12 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/casic_iot_br1?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
-    username: root
-    password: Casic203
-#    url: jdbc:mysql://172.27.34.168:3316/casic_iot_platform?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
-#    username: bjwxduser
-#    password: hpQEn5my9md#U
+#    url: jdbc:mysql://111.198.10.15:11336/casic_iot_br1?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+#    username: root
+#    password: Casic203
+    url: jdbc:mysql://172.27.34.168:3316/casic_iot_platform?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+    username: bjwxduser
+    password: hpQEn5my9md#U
   jms:
     pub-sub-domain: true
 # session:b