Merge branch 'master_dev' into 'master'

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

See merge request yunteng/thingskit!414

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