Commit 7d864a4cc04e26506f523c9bac3fb80505d9d432

Authored by xp.Huang
1 parent 119dde81

fix: 修改场景联动告警通知的判断

... ... @@ -17,9 +17,9 @@ import org.springframework.cache.Cache;
17 17 import org.springframework.cache.CacheManager;
18 18 import org.thingsboard.rule.engine.api.TbContext;
19 19 import org.thingsboard.server.common.data.DataConstants;
  20 +import org.thingsboard.server.common.data.StringUtils;
20 21 import org.thingsboard.server.common.data.alarm.Alarm;
21 22 import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest;
22   -import org.thingsboard.server.common.data.alarm.AlarmStatus;
23 23 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilter;
24 24 import org.thingsboard.server.common.data.device.profile.AlarmConditionFilterKey;
25 25 import org.thingsboard.server.common.data.device.profile.AlarmRule;
... ... @@ -520,7 +520,7 @@ class ReactState {
520 520 tkDeviceService.freshAlarmStatus(entityId, 1);
521 521 currentAlarms.put(deviceId, currentAlarm);
522 522 alarmMsg(ctx, msg, currentAlarm, "Alarm Cleared");
523   - if(action.getAlarmProfileId().isEmpty()){
  523 + if(StringUtils.isEmpty(action.getAlarmProfileId())){
524 524 return;
525 525 }
526 526 AlarmInfoDTO formData = new AlarmInfoDTO();
... ...