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

Alarm State improvement

Browse Source
This commit is contained in:
Andrii Shvaika 2021-03-09 12:25:56 +02:00
parent 953054fadc
commit 46f742441f
1 changed files with 3 additions and 1 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/profile/AlarmState.java
View File

@ -255,8 +255,10 @@ class AlarmState {
if (StringUtils.isNotEmpty(alarmDetailsStr)) { if (StringUtils.isNotEmpty(alarmDetailsStr)) {
for (var keyFilter : ruleState.getAlarmRule().getCondition().getCondition()) { for (var keyFilter : ruleState.getAlarmRule().getCondition().getCondition()) {
EntityKeyValue entityKeyValue = dataSnapshot.getValue(keyFilter.getKey()); EntityKeyValue entityKeyValue = dataSnapshot.getValue(keyFilter.getKey());
if (entityKeyValue != null) {
alarmDetailsStr = alarmDetailsStr.replaceAll(String.format("\\$\\{%s}", keyFilter.getKey().getKey()), getValueAsString(entityKeyValue)); alarmDetailsStr = alarmDetailsStr.replaceAll(String.format("\\$\\{%s}", keyFilter.getKey().getKey()), getValueAsString(entityKeyValue));
} }
}
ObjectNode newDetails = JacksonUtil.newObjectNode(); ObjectNode newDetails = JacksonUtil.newObjectNode();
newDetails.put("data", alarmDetailsStr); newDetails.put("data", alarmDetailsStr);
alarmDetails = newDetails; alarmDetails = newDetails;