Merge remote-tracking branch 'origin/master_dev' into master_dev

@@ -225,13 +225,13 @@ class ReactState {
     if (triggerMatched.get() && conditionMatched.get() && !actionData.equals(msgData)) {
     if (triggerMatched.get() && conditionMatched.get() && !actionData.equals(msgData)) {
       actionData = msgData;
       actionData = msgData;
       log.debug(String.format("设备【%s】的消息内容【%s】触发动作", deviceId, msgData));
       log.debug(String.format("设备【%s】的消息内容【%s】触发动作", deviceId, msgData));
-      for (TkDoActionEntity item : actions) {
-        if (ActionTypeEnum.MSG_NOTIFY.equals(item.getOutTarget())) {
-          noticeMsg(ctx, msg, item, deviceId, detail, msg.getTs());
+      actions.forEach(act ->{
+        if (ActionTypeEnum.MSG_NOTIFY.equals(act.getOutTarget())) {
+          noticeMsg(ctx, msg, act, deviceId, detail, msg.getTs());
         } else {
         } else {
-          pushMsg(ctx, msg, item);
+          pushMsg(ctx, msg, act);
         }
         }
-      }
+      });
     } else {
     } else {
       ctx.tellSuccess(msg);
       ctx.tellSuccess(msg);
     }
     }
@@ -390,7 +390,9 @@ class ReactState {
     DeviceId entityId = new DeviceId(UUID.fromString(deviceId));
     DeviceId entityId = new DeviceId(UUID.fromString(deviceId));
     ActionAlarmDTO actionAlarm =
     ActionAlarmDTO actionAlarm =
         JacksonUtil.convertValue(action.getDoContext(), ActionAlarmDTO.class);
         JacksonUtil.convertValue(action.getDoContext(), ActionAlarmDTO.class);
-
+    if(actionAlarm.getAlarmLevel() == null){
+      return;
+    }
     Alarm currentAlarm = new Alarm();
     Alarm currentAlarm = new Alarm();
     currentAlarm.setType(reactName);
     currentAlarm.setType(reactName);
     currentAlarm.setStatus(AlarmStatus.ACTIVE_UNACK);
     currentAlarm.setStatus(AlarmStatus.ACTIVE_UNACK);