Fixed issue with alarm update/create on edge

thingsboard · Nov 22, 2023 · e465468 · e465468
1 parent 8f522ea
commit e465468
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java b/...main/java/org/thingsboard/server/service/edge/rpc/processor/alarm/BaseAlarmProcessor.java
@@ -73,7 +73,8 @@ protected ListenableFuture<Void> processAlarmMsg(TenantId tenantId, AlarmUpdateM
                     alarm.setAckTs(alarmUpdateMsg.getAckTs());
                     alarm.setEndTs(alarmUpdateMsg.getEndTs());
                     alarm.setDetails(JacksonUtil.toJsonNode(alarmUpdateMsg.getDetails()));
-                    if (UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE.equals(alarmUpdateMsg.getMsgType())) {
+                    Alarm alarmById = alarmService.findAlarmById(tenantId, alarmId);
+                    if (alarmById == null) {
                         alarmService.createAlarm(AlarmCreateOrUpdateActiveRequest.fromAlarm(alarm, null, alarmId));
                     } else {
                         alarmService.updateAlarm(AlarmUpdateRequest.fromAlarm(alarm));