dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set notificationRuleId in TbCreateAlarmNode

Browse Source
This commit is contained in:
ViacheslavKlimov 2022-12-06 10:19:08 +02:00
parent a4ce6252de
commit 17e4b322c1
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNode.java
View File

@ -184,6 +184,7 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
existingAlarm.setDetails(details); existingAlarm.setDetails(details);
} }
existingAlarm.setEndTs(System.currentTimeMillis()); existingAlarm.setEndTs(System.currentTimeMillis());
existingAlarm.setNotificationRuleId(config.getNotificationRuleId());
return ctx.getAlarmService().createOrUpdateAlarm(existingAlarm); return ctx.getAlarmService().createOrUpdateAlarm(existingAlarm);
}, ctx.getDbCallbackExecutor()); }, ctx.getDbCallbackExecutor());
@ -205,6 +206,7 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
.startTs(ts) .startTs(ts)
.endTs(ts) .endTs(ts)
.details(details) .details(details)
.notificationRuleId(config.getNotificationRuleId())
.build(); .build();
} }

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
View File

@ -18,6 +18,7 @@ package org.thingsboard.rule.engine.action;
import lombok.Data; import lombok.Data;
import org.thingsboard.rule.engine.api.NodeConfiguration; import org.thingsboard.rule.engine.api.NodeConfiguration;
import org.thingsboard.server.common.data.alarm.AlarmSeverity; import org.thingsboard.server.common.data.alarm.AlarmSeverity;
import org.thingsboard.server.common.data.id.NotificationRuleId;
import org.thingsboard.server.common.data.script.ScriptLanguage; import org.thingsboard.server.common.data.script.ScriptLanguage;
import java.util.Collections; import java.util.Collections;
@ -36,6 +37,8 @@ public class TbCreateAlarmNodeConfiguration extends TbAbstractAlarmNodeConfigura
private List<String> relationTypes; private List<String> relationTypes;
private NotificationRuleId notificationRuleId;
@Override @Override
public TbCreateAlarmNodeConfiguration defaultConfiguration() { public TbCreateAlarmNodeConfiguration defaultConfiguration() {
TbCreateAlarmNodeConfiguration configuration = new TbCreateAlarmNodeConfiguration(); TbCreateAlarmNodeConfiguration configuration = new TbCreateAlarmNodeConfiguration();

1
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmState.java
View File

@ -241,6 +241,7 @@ class AlarmState {
// Skip update if severity is decreased. // Skip update if severity is decreased.
if (severity.ordinal() <= oldSeverity.ordinal()) { if (severity.ordinal() <= oldSeverity.ordinal()) {
currentAlarm.setDetails(createDetails(ruleState)); currentAlarm.setDetails(createDetails(ruleState));
currentAlarm.setNotificationRuleId(alarmDefinition.getNotificationRuleId());
if (!oldSeverity.equals(severity)) { if (!oldSeverity.equals(severity)) {
currentAlarm.setSeverity(severity); currentAlarm.setSeverity(severity);
currentAlarm = ctx.getAlarmService().createOrUpdateAlarm(currentAlarm); currentAlarm = ctx.getAlarmService().createOrUpdateAlarm(currentAlarm);