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

Create Alarm node use metadata alarm type (#1681)

Browse Source
This commit is contained in:
Valerii Sosliuk 2019-05-04 13:39:35 +03:00 committed by GitHub
parent bad855027b
commit 8daa3f99f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
final Alarm msgAlarm; final Alarm msgAlarm;
if (!config.isUseMessageAlarmData()) { if (!config.isUseMessageAlarmData()) {
alarmType = config.getAlarmType(); alarmType = TbNodeUtils.processPattern(this.config.getAlarmType(), msg.getMetaData());
msgAlarm = null; msgAlarm = null;
} else { } else {
try { try {
@ -138,7 +138,7 @@ public class TbCreateAlarmNode extends TbAbstractAlarmNode<TbCreateAlarmNodeConf
.status(AlarmStatus.ACTIVE_UNACK) .status(AlarmStatus.ACTIVE_UNACK)
.severity(config.getSeverity()) .severity(config.getSeverity())
.propagate(config.isPropagate()) .propagate(config.isPropagate())
.type(config.getAlarmType()) .type(TbNodeUtils.processPattern(this.config.getAlarmType(), msg.getMetaData()))
//todo-vp: alarm date should be taken from Message or current Time should be used? //todo-vp: alarm date should be taken from Message or current Time should be used?
// .startTs(System.currentTimeMillis()) // .startTs(System.currentTimeMillis())
// .endTs(System.currentTimeMillis()) // .endTs(System.currentTimeMillis())

2
rule-engine/rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js
View File

File diff suppressed because one or more lines are too long