Browse Source

fix alarm get propagation ids

pull/3346/head
YevhenBondarenko 6 years ago
parent
commit
77ffb32f00
  1. 8
      dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java

8
dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java

@ -391,8 +391,12 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
}
private Set<EntityId> getPropagationEntityIds(Alarm alarm) {
List<EntityRelation> relations = relationService.findByTo(alarm.getTenantId(), alarm.getId(), RelationTypeGroup.ALARM);
return relations.stream().map(EntityRelation::getFrom).collect(Collectors.toSet());
if (alarm.isPropagate()) {
List<EntityRelation> relations = relationService.findByTo(alarm.getTenantId(), alarm.getId(), RelationTypeGroup.ALARM);
return relations.stream().map(EntityRelation::getFrom).collect(Collectors.toSet());
} else {
return Collections.singleton(alarm.getOriginator());
}
}
private void createAlarmRelation(TenantId tenantId, EntityId entityId, EntityId alarmId) {

Loading…
Cancel
Save