Browse Source

fixed originatorDisplayName getter

pull/14640/head
dashevchenko 9 months ago
parent
commit
d0fd778bea
  1. 6
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmInfo.java

6
common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmInfo.java

@ -41,7 +41,6 @@ public class AlarmInfo extends Alarm {
@Schema(description = "Alarm originator label", example = "Thermostat label") @Schema(description = "Alarm originator label", example = "Thermostat label")
private String originatorLabel; private String originatorLabel;
@Getter
@Setter @Setter
@Schema(description = "Originator display name", example = "Thermostat") @Schema(description = "Originator display name", example = "Thermostat")
private String originatorDisplayName; private String originatorDisplayName;
@ -59,10 +58,15 @@ public class AlarmInfo extends Alarm {
super(alarm); super(alarm);
} }
public String getOriginatorDisplayName() {
return originatorDisplayName != null ? originatorDisplayName : (originatorLabel != null ? originatorLabel : originatorName);
}
public AlarmInfo(AlarmInfo alarmInfo) { public AlarmInfo(AlarmInfo alarmInfo) {
super(alarmInfo); super(alarmInfo);
this.originatorName = alarmInfo.getOriginatorName(); this.originatorName = alarmInfo.getOriginatorName();
this.originatorLabel = alarmInfo.getOriginatorLabel(); this.originatorLabel = alarmInfo.getOriginatorLabel();
this.originatorDisplayName = alarmInfo.getOriginatorDisplayName();
this.assignee = alarmInfo.getAssignee(); this.assignee = alarmInfo.getAssignee();
} }

Loading…
Cancel
Save