工业报警器消警逻辑

aa113a98 · 耿迪迪 · 315815b3 · aa113a98
Commit aa113a98 authored Mar 28, 2023 by 耿迪迪
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

FactoryDetectorUdpServerHandler.java ...report/netty/handler/FactoryDetectorUdpServerHandler.java +6 -2

No files found.
--- a/src/main/java/com/zehong/gassdevicereport/netty/handler/FactoryDetectorUdpServerHandler.java
+++ b/src/main/java/com/zehong/gassdevicereport/netty/handler/FactoryDetectorUdpServerHandler.java
@@ -97,9 +97,13 @@ public class FactoryDetectorUdpServerHandler extends SimpleChannelInboundHandler
            }
        }else {
            if(null != alarm){
-                alarm.setEndTime(new Date());
-                alarm.setDealStatus("4");
+                //手动消警的报警结束更新状态
+                if("4".equals(alarm.getDealStatus())){
+                    alarm.setDealStatus("");
+                }
+                alarm.setEndTime(DateUtils.getNowDate());
                itDeviceAlarmService.updateTDeviceAlarm(alarm);
+                pushWedSocket(alarm.getAlarmId());
            }
        }
    }