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

process ALARM_ACK msg in device state

Browse Source
This commit is contained in:
YevhenBondarenko 2021-01-19 17:06:53 +02:00
parent c1223b0c10
commit 24ebc06fa4
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,4 +291,11 @@ class AlarmState {
} }
return updated; return updated;
} }
public void processAckAlarm(Alarm alarm) {
if (currentAlarm != null && currentAlarm.getId().equals(alarm.getId())) {
currentAlarm.setStatus(alarm.getStatus());
currentAlarm.setAckTs(alarm.getAckTs());
}
}
} }

12
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceState.java
View File

@ -140,6 +140,8 @@ class DeviceState {
stateChanged = processAttributesDeleteNotification(ctx, msg); stateChanged = processAttributesDeleteNotification(ctx, msg);
} else if (msg.getType().equals(DataConstants.ALARM_CLEAR)) { } else if (msg.getType().equals(DataConstants.ALARM_CLEAR)) {
stateChanged = processAlarmClearNotification(ctx, msg); stateChanged = processAlarmClearNotification(ctx, msg);
} else if (msg.getType().equals(DataConstants.ALARM_ACK)) {
processAlarmAckNotification(ctx, msg);
} else { } else {
ctx.tellSuccess(msg); ctx.tellSuccess(msg);
} }
@ -161,6 +163,16 @@ class DeviceState {
return stateChanged; return stateChanged;
} }
private void processAlarmAckNotification(TbContext ctx, TbMsg msg) {
Alarm alarmNf = JacksonUtil.fromString(msg.getData(), Alarm.class);
for (DeviceProfileAlarm alarm : deviceProfile.getAlarmSettings()) {
AlarmState alarmState = alarmStates.computeIfAbsent(alarm.getId(),
a -> new AlarmState(this.deviceProfile, deviceId, alarm, getOrInitPersistedAlarmState(alarm)));
alarmState.processAckAlarm(alarmNf);
}
ctx.tellSuccess(msg);
}
private boolean processAttributesUpdateNotification(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException { private boolean processAttributesUpdateNotification(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException {
Set<AttributeKvEntry> attributes = JsonConverter.convertToAttributes(new JsonParser().parse(msg.getData())); Set<AttributeKvEntry> attributes = JsonConverter.convertToAttributes(new JsonParser().parse(msg.getData()));
String scope = msg.getMetaData().getValue("scope"); String scope = msg.getMetaData().getValue("scope");