diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
index c41b4bbb7..3d23f4bd6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
@@ -56,10 +56,10 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
             //心跳
             smokeDev.setUploadDate(date);
             smokeDevMapper.updateById(smokeDev);
-        } else if (Objects.equals(dto.getAlarm(), 1)) {
+        } else if (Objects.equals(dto.getAlarm(), 1) || Objects.equals(dto.getAlarm(), 0)) {
             SmokeDevAlarm smokeDevAlarm = new SmokeDevAlarm();
             smokeDevAlarm.setDevSn(deviceid);
-            smokeDevAlarm.setAlarmTime(new Date(Long.valueOf(dto.getTime())));
+            smokeDevAlarm.setAlarmTime(new Date(Long.parseLong(dto.getTime())));
             smokeDevAlarm.setDeviceStatus(dto.getAlarm());
             smokeDevAlarm.setProjectSn(smokeDev.getProjectSn());
             smokeDevAlarm.setAlarmDetailStatus(dto.getState());