|
@@ -151,7 +151,7 @@ public class BusDeviceAlarmEntity extends TenantGenericEntity<String,String> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public boolean alarmOrWarn(){
|
|
public boolean alarmOrWarn(){
|
|
|
- if (this.getAlarm() != null && !DeviceAlarmEnum.None.equals(this.getAlarm())) {
|
|
|
|
|
|
|
+ if (this.getAlarmState() != null && !DeviceAlarmEnum.None.equals(this.getAlarmState())) {
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
if (Boolean.TRUE.equals(this.getWarnAnalgesicPoor())) {
|
|
if (Boolean.TRUE.equals(this.getWarnAnalgesicPoor())) {
|
