refactor: 场景联动触发告警通知

云中非
1 parent 13530c95
Showing 8 changed files with 132 additions and 124 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmNoticeController.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/ActionAlarmDTO.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/AlarmInfoDTO.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtNoticeServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtNoticeService.java
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notice/AlarmNoticeNode.java
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/ReactState.java
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/TriggerState.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmNoticeController.java
View file @1afb808
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtAlarmNoticeController.java
View file @1afb808
@@ -28,17 +28,18 @@ import java.net.InetAddress;
 @RequiredArgsConstructor
 @Slf4j
 @Api(tags = {"告警通知"})
+@Deprecated
 public class YtAlarmNoticeController {
     private final YtNoticeService service;
-    @PostMapping("/alert")
+    @PostMapping("/alert/{alarmProfileId}")
     public void alertNotice(@RequestParam(value = "token", required = true) String token,
-                            @RequestBody AlarmInfoDTO alarmInfo) {
+                            @PathVariable("alarmProfileId") String alarmProfileId, @RequestBody AlarmInfoDTO alarmInfo) {
         Assert.notNull(token, "token cannot be null");
         Assert.notNull(alarmInfo, "alarm info cannot be null");
         if (parseTokenClaims(token, alarmInfo)) {
-            service.alert(alarmInfo);
+            service.alert(alarmProfileId, alarmInfo);
         }
     }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/ActionAlarmDTO.java
View file @1afb808
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/ActionAlarmDTO.java
View file @1afb808
@@ -12,19 +12,14 @@ import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import java.util.List;
 /**
- * @Description  场景联动动作告警通知
+ * @Description 场景联动动作告警通知
  * @Author cxy
  * @Date 2021/11/24 17:32
  */
 @Data
-public class ActionAlarmDTO extends  TenantDTO{
+public class ActionAlarmDTO extends TenantDTO {
-    private List<ActionTypeEnum> noticeType;
-
-    /**告警联系人*/
-    private List<String> noticeUser;
-
     private AlarmSeverity alarmLevel;
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/AlarmInfoDTO.java
View file @1afb808
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/AlarmInfoDTO.java
View file @1afb808
@@ -6,37 +6,38 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotEmpty;
-/** @Description @Author cxy @Date 2021/11/16 17:49 */
+/**
+ * @Description @Author cxy @Date 2021/11/16 17:49
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class AlarmInfoDTO extends TenantDTO {
-  @ApiModelProperty(value = "告警时间")
-  private long createTs;
+    @ApiModelProperty(value = "告警时间")
+    private long createTs;
-  @ApiModelProperty(value = "告警类型")
-  private String type;
+    @ApiModelProperty(value = "告警名称")
+    private String type;
-  @ApiModelProperty(value = "告警详情")
-  private String details;
+    @ApiModelProperty(value = "告警详情")
+    private String details;
-  @ApiModelProperty(value = "告警开始时间")
-  private long startTs;
+    @ApiModelProperty(value = "告警开始时间")
+    private long startTs;
-  @ApiModelProperty(value = "告警结束时间")
-  private long endTs;
+    @ApiModelProperty(value = "告警结束时间")
+    private long endTs;
-  @ApiModelProperty(value = "告警状态")
-  private String status;
+    @ApiModelProperty(value = "告警状态")
+    private String status;
-  @ApiModelProperty(value = "告警程度")
-  private String severity;
+    @ApiModelProperty(value = "告警程度")
+    private String severity;
-
-  @ApiModelProperty(value = "告警设备名称")
-  private String deviceName;
-  @ApiModelProperty(value = "告警设备ID")
-  @NotEmpty(message = "设备ID不能为空")
-  private String deviceId;
+    @ApiModelProperty(value = "告警设备名称")
+    private String deviceName;
+    @ApiModelProperty(value = "告警设备ID")
+    @NotEmpty(message = "设备ID不能为空")
+    private String deviceId;
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtNoticeServiceImpl.java
View file @1afb808
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtNoticeServiceImpl.java
View file @1afb808
@@ -13,13 +13,10 @@ import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.YtDateTimeUtils;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
-import org.thingsboard.server.dao.yunteng.service.YtNoticeService;
 import org.thingsboard.server.dao.yunteng.service.YtMailService;
+import org.thingsboard.server.dao.yunteng.service.YtNoticeService;
 import org.thingsboard.server.dao.yunteng.service.YtSmsService;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -47,7 +44,7 @@ public class YtNoticeServiceImpl implements YtNoticeService {
     private final YtMailService mailService;
     @Override
-    public void alert(AlarmInfoDTO alarmInfo) {
+    public void alert(String profileId, AlarmInfoDTO alarmInfo) {
         /**
          * 1、查找设备和设备所属组织
@@ -68,11 +65,8 @@ public class YtNoticeServiceImpl implements YtNoticeService {
                 .eq(Organization::getId, device.getOrganizationId());
         Organization organization = organizationMapper.selectOne(organizationQueryWrapper);
-        QueryWrapper<AlarmProfile> alarmProfileQueryWrapper = new QueryWrapper<AlarmProfile>();
-        //TODO junlianglee 修改通知
-//        alarmProfileQueryWrapper.lambda()
-//                .eq(AlarmProfile::getDeviceProfileId, device.getProfileId());
-        AlarmProfile alarmProfile = alarmProfileMapper.selectOne(alarmProfileQueryWrapper);
+
+        AlarmProfile alarmProfile = alarmProfileMapper.selectById(profileId);
         if (alarmProfile == null || alarmProfile.getAlarmContactId().isEmpty() || alarmProfile.getMessageMode().isEmpty()) {
@@ -80,7 +74,7 @@ public class YtNoticeServiceImpl implements YtNoticeService {
         }
         String messageCode = alarmProfile.getMessageMode();
         List<AlarmContact> alarmContactList = alarmContactMapper.selectBatchIds(Arrays.stream(alarmProfile.getAlarmContactId().split(",")).distinct().collect(Collectors.toList()));
-        noticeAll(messageCode, alarmContactList, alarmInfo, organization,alarmProfile.getTenantId());
+        noticeAll(messageCode, alarmContactList, alarmInfo, organization, alarmProfile.getTenantId());
     }
@@ -93,7 +87,7 @@ public class YtNoticeServiceImpl implements YtNoticeService {
      * @param alarmInfo        通知内容
      * @param organization     设备所属组织
      */
-    private void noticeAll(String messageCode, List<AlarmContact> alarmContactList, AlarmInfoDTO alarmInfo, Organization organization,String tenantId) {
+    private void noticeAll(String messageCode, List<AlarmContact> alarmContactList, AlarmInfoDTO alarmInfo, Organization organization, String tenantId) {
         Optional.ofNullable(alarmContactList).ifPresent(contacts -> {
             /**可用的告警通知模板*/
@@ -113,35 +107,36 @@ public class YtNoticeServiceImpl implements YtNoticeService {
             if (messageCode.contains(MessageTypeEnum.PHONE_MESSAGE.name())
                     && templatesMap.containsKey(MessageTypeEnum.PHONE_MESSAGE.name())) {
-                sms4Alarm(alarmInfo,templatesMap.get(MessageTypeEnum.PHONE_MESSAGE.name()),organization,contacts);
+                sms4Alarm(alarmInfo, templatesMap.get(MessageTypeEnum.PHONE_MESSAGE.name()), organization, contacts);
             }
             if (messageCode.contains(MessageTypeEnum.EMAIL_MESSAGE.name())
                     && templatesMap.containsKey(MessageTypeEnum.EMAIL_MESSAGE.name())) {
-                email4Alarm(alarmInfo,templatesMap.get(MessageTypeEnum.EMAIL_MESSAGE.name()),organization,contacts);
+                email4Alarm(alarmInfo, templatesMap.get(MessageTypeEnum.EMAIL_MESSAGE.name()), organization, contacts);
             }
             if (messageCode.contains(MessageTypeEnum.DING_TALK_MESSAGE.name())
                     && templatesMap.containsKey(MessageTypeEnum.DING_TALK_MESSAGE.name())) {
-                dingTalk4Alarm(alarmInfo,templatesMap.get(MessageTypeEnum.DING_TALK_MESSAGE.name()),organization,contacts);
+                dingTalk4Alarm(alarmInfo, templatesMap.get(MessageTypeEnum.DING_TALK_MESSAGE.name()), organization, contacts);
             }
             if (messageCode.contains(MessageTypeEnum.WECHAT_MESSAGE.name())
                     && templatesMap.containsKey(MessageTypeEnum.WECHAT_MESSAGE.name())) {
-                weChat4Alarm(alarmInfo,templatesMap.get(MessageTypeEnum.WECHAT_MESSAGE.name()),organization,contacts);
+                weChat4Alarm(alarmInfo, templatesMap.get(MessageTypeEnum.WECHAT_MESSAGE.name()), organization, contacts);
             }
         });
     }
     /**
      * 短信通知设备告警信息
-     * @param alarmInfo     告警信息
-     * @param templateId    告警模板主键
-     * @param organization  设备所属组织
-     * @param contacts      设备告警联系人
+     *
+     * @param alarmInfo    告警信息
+     * @param templateId   告警模板主键
+     * @param organization 设备所属组织
+     * @param contacts     设备告警联系人
      */
-    private void sms4Alarm(AlarmInfoDTO alarmInfo,String templateId, Organization organization,List<AlarmContact> contacts){
+    private void sms4Alarm(AlarmInfoDTO alarmInfo, String templateId, Organization organization, List<AlarmContact> contacts) {
         SmsReqDTO info = new SmsReqDTO();
         info.setId(templateId);
         info.setTemplatePurpose(MsgTemplatePurposeEnum.FOR_ALARM_NOTICE.name());
@@ -163,12 +158,13 @@ public class YtNoticeServiceImpl implements YtNoticeService {
     /**
      * 邮件通知设备告警信息
-     * @param alarmInfo     告警信息
-     * @param templateId    告警模板主键
-     * @param organization  设备所属组织
-     * @param contacts      设备告警联系人
+     *
+     * @param alarmInfo    告警信息
+     * @param templateId   告警模板主键
+     * @param organization 设备所属组织
+     * @param contacts     设备告警联系人
      */
-    private void email4Alarm(AlarmInfoDTO alarmInfo,String templateId, Organization organization,List<AlarmContact> contacts){
+    private void email4Alarm(AlarmInfoDTO alarmInfo, String templateId, Organization organization, List<AlarmContact> contacts) {
         List<String> emailReceivers = new ArrayList<>();
         contacts.stream().parallel().forEach(item -> {
             if (!item.getEmail().isEmpty()) {
@@ -178,12 +174,12 @@ public class YtNoticeServiceImpl implements YtNoticeService {
         if (!emailReceivers.isEmpty()) {
             EmailReqDTO info = new EmailReqDTO();
             info.setTo(emailReceivers.toArray(new String[emailReceivers.size()]));
-            info.setSubject(String.format("【%s】告警通知",alarmInfo.getDeviceName()));
-            String body =String.format("%s位于【%s】的设备【%s】触发【%s】级的【%s】，请尽快处理！"
-                    ,YtDateTimeUtils.formate(alarmInfo.getCreateTs())
+            info.setSubject(String.format("【%s】告警通知", alarmInfo.getDeviceName()));
+            String body = String.format("%s位于【%s】的设备【%s】触发【%s】级的【%s】，请尽快处理！"
+                    , YtDateTimeUtils.formate(alarmInfo.getCreateTs())
                     , organization != null ? organization.getName() : ""
-                    ,alarmInfo.getDeviceName()
-                    ,alarmInfo.getSeverity()
+                    , alarmInfo.getDeviceName()
+                    , alarmInfo.getSeverity()
                     , alarmInfo.getType());
             info.setBody(body);
             info.setEmailFormatEnum(EmailFormatEnum.TEXT.name());
@@ -196,12 +192,13 @@ public class YtNoticeServiceImpl implements YtNoticeService {
     /**
      * 钉钉通知设备告警信息
-     * @param alarmInfo     告警信息
-     * @param templateId    告警模板主键
-     * @param organization  设备所属组织
-     * @param contacts      设备告警联系人
+     *
+     * @param alarmInfo    告警信息
+     * @param templateId   告警模板主键
+     * @param organization 设备所属组织
+     * @param contacts     设备告警联系人
      */
-    private void dingTalk4Alarm(AlarmInfoDTO alarmInfo,String templateId, Organization organization,List<AlarmContact> contacts){
+    private void dingTalk4Alarm(AlarmInfoDTO alarmInfo, String templateId, Organization organization, List<AlarmContact> contacts) {
         // TODO 推送钉钉消息
         SmsReqDTO info = new SmsReqDTO();
         info.setId(templateId);
@@ -224,12 +221,13 @@ public class YtNoticeServiceImpl implements YtNoticeService {
     /**
      * 微信通知设备告警信息
-     * @param alarmInfo     告警信息
-     * @param templateId    告警模板主键
-     * @param organization  设备所属组织
-     * @param contacts      设备告警联系人
+     *
+     * @param alarmInfo    告警信息
+     * @param templateId   告警模板主键
+     * @param organization 设备所属组织
+     * @param contacts     设备告警联系人
      */
-    private void weChat4Alarm(AlarmInfoDTO alarmInfo,String templateId, Organization organization,List<AlarmContact> contacts){
+    private void weChat4Alarm(AlarmInfoDTO alarmInfo, String templateId, Organization organization, List<AlarmContact> contacts) {
         // TODO 推送微信通知
         SmsReqDTO info = new SmsReqDTO();
         info.setId(templateId);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtNoticeService.java
View file @1afb808
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtNoticeService.java
View file @1afb808
@@ -18,8 +18,9 @@ public interface YtNoticeService {
      * 设备告警通知负责人
      * * @param alarmInfo
      *
+     * @param profileId 告警配置主键
      * @param alarmInfo 告警数据
      */
-    void alert(AlarmInfoDTO alarmInfo);
+    void alert(String profileId, AlarmInfoDTO alarmInfo);
 }
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notice/AlarmNoticeNode.java
View file @1afb808
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/notice/AlarmNoticeNode.java
View file @1afb808
@@ -33,15 +33,9 @@ import java.net.InetAddress;
 import static org.thingsboard.common.util.DonAsynchron.withCallback;
 @Slf4j
-@RuleNode(
-        type = ComponentType.EXTERNAL,
-        name = "alarm notice",
-        configClazz = AlarmNoticeNodeConfiguration.class,
-        nodeDescription = "while device alarm, notice some people.",
-        nodeDetails = "notice method include sms,email and so on.",
+@RuleNode(type = ComponentType.EXTERNAL, name = "alarm notice", configClazz = AlarmNoticeNodeConfiguration.class, nodeDescription = "while device alarm, notice some people.", nodeDetails = "notice method include sms,email and so on.",
 //        configDirective = "tbActionNodeSendSmsConfig",
-        icon = "sms"
-)
+        icon = "sms")
 public class AlarmNoticeNode implements TbNode {
     private AlarmNoticeNodeConfiguration config;
@@ -64,11 +58,11 @@ public class AlarmNoticeNode implements TbNode {
     public void onMsg(TbContext ctx, TbMsg msg) {
         try {
             withCallback(ctx.getSmsExecutor().executeAsync(() -> {
-                        posetApi(ctx, msg);
-                        return null;
-                    }),
-                    ok -> {ctx.tellSuccess(msg);},
-                    fail -> ctx.tellFailure(msg, fail));
+                posetApi(ctx, msg);
+                return null;
+            }), ok -> {
+                ctx.tellSuccess(msg);
+            }, fail -> ctx.tellFailure(msg, fail));
         } catch (Exception ex) {
             ctx.tellFailure(msg, ex);
         }
@@ -96,7 +90,7 @@ public class AlarmNoticeNode implements TbNode {
         formData.setTenantId(tenantId);
         formData.setSeverity(severity);
-        service.alert(formData);
+        service.alert(null, formData);
     }
     @Override
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/ReactState.java
View file @1afb808
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/ReactState.java
View file @1afb808
@@ -9,11 +9,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 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;
 import org.thingsboard.server.common.data.rule.RuleNodeState;
+import org.thingsboard.server.common.data.yunteng.dto.ActionAlarmDTO;
+import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
@@ -25,7 +28,9 @@ import org.thingsboard.server.dao.yunteng.entities.DoCondition;
 import org.thingsboard.server.dao.yunteng.service.DoActionService;
 import org.thingsboard.server.dao.yunteng.service.DoConditionService;
 import org.thingsboard.server.dao.yunteng.service.TriggerService;
+import org.thingsboard.server.dao.yunteng.service.YtNoticeService;
+import java.net.InetAddress;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
@@ -64,6 +69,7 @@ class ReactState {
      * 【场景联动的执行集合】懒加载
      */
     private final List<DoAction> actions;
+    private final YtNoticeService noticeService;
     private RuleNodeState state;
@@ -77,6 +83,7 @@ class ReactState {
         this.conditions = conditionService.getConditions(reactId);
         DoActionService actionService = SpringBeanUtils.getBean(DoActionService.class);
         this.actions = actionService.getActions(reactId);
+        this.noticeService = SpringBeanUtils.getBean(YtNoticeService.class);
     }
@@ -84,6 +91,7 @@ class ReactState {
     public void process(TbContext ctx, TbMsg msg, String deviceId) throws ExecutionException, InterruptedException {
+        StringBuilder detail = new StringBuilder();
         if (actions == null) {
             ctx.tellSuccess(msg);
         }
@@ -97,6 +105,7 @@ class ReactState {
                 TriggerState triggerState = getOrCreateTriggerState(trigger, deviceId);
                 matched = triggerState.process(ctx, msg);
                 if (matched) {
+                    detail.append(triggerState.getAlarmDetails());
                     break;
                 }
             }
@@ -115,6 +124,8 @@ class ReactState {
                     TriggerState conditionState = getOrCreateConditionState(item.getId(), id, item.getTriggerCondition());
                     if (conditionState == null
                             || conditionState.process(ctx, msg)) {
+                        detail.append("；");
+                        detail.append(conditionState.getAlarmDetails());
                         matched = true;
                         break;
                     }
@@ -127,7 +138,7 @@ class ReactState {
         if (matched) {
             for (DoAction item : actions) {
-                pushMsg(ctx, msg, item);
+                pushMsg(ctx, msg, item,detail.toString());
             }
         } else {
             ctx.tellSuccess(msg);
@@ -169,12 +180,12 @@ class ReactState {
         for (AlarmConditionFilter filter : rule.getCondition().getCondition()) {
             filterKeys.add(filter.getKey());
         }
-        TriggerState state = new TriggerState(deviceId, rule, filterKeys, null);
+        TriggerState state = new TriggerState(deviceId, rule, filterKeys, rule.getAlarmDetails(),null);
         return state;
     }
-    private void pushMsg(TbContext ctx, TbMsg msg, DoAction action) {
+    private void pushMsg(TbContext ctx, TbMsg msg, DoAction action,String detail) {
         TbMsgMetaData metaData = //lastMsgMetaData != null ? lastMsgMetaData.copy() :
                 new TbMsgMetaData();
         String relationType = "";
@@ -184,19 +195,15 @@ class ReactState {
                 rpcMsg(ctx, msg, action.getDeviceId(), action.getDoContext());
                 break;
             case SCENE_ACT:
-                //TODO: 场景联动关联消息通知
+                reactMsg(ctx, msg, action);
                 break;
             case MSG_NOTIFY:
-                noticeMsg(ctx, msg, action.getDoContext());
+                noticeMsg(ctx, msg, action,detail);
                 break;
             default:
                 ctx.tellSuccess(msg);
                 break;
         }
-
-        if (newMsg != null) {
-            ctx.tellNext(newMsg, relationType);
-        }
     }
     /**
@@ -226,9 +233,32 @@ class ReactState {
      *
      * @param ctx
      * @param msg
-     * @param context
+     * @param action
      */
-    private void noticeMsg(TbContext ctx, TbMsg msg, JsonNode context) {
+    private void noticeMsg(TbContext ctx, TbMsg msg, DoAction action,String detail) {
+        Alarm alarm = JacksonUtil.convertValue(msg.getData(), Alarm.class);
+        String tenantId = alarm.getTenantId().getId().toString();
+        String deviceId = alarm.getOriginator().getId().toString();
+        String severity = alarm.getSeverity().name();
+        ActionAlarmDTO actionAlarm = JacksonUtil.convertValue(action.getDoContext(),ActionAlarmDTO.class);
+
+
+        AlarmInfoDTO formData = new AlarmInfoDTO();
+        formData.setDeviceName(msg.getMetaData().getData().get("deviceName"));
+        formData.setDetails(detail);
+        formData.setType(alarm.getType());
+        formData.setCreateTs(alarm.getCreatedTime());
+        formData.setStartTs(alarm.getStartTs());
+        formData.setEndTs(alarm.getEndTs());
+        formData.setStatus(alarm.getStatus().name());
+        formData.setDeviceId(deviceId);
+        formData.setTenantId(tenantId);
+        formData.setSeverity(actionAlarm.getAlarmLevel().name());
+        noticeService.alert(action.getAlarmProfileId(),formData);
+    }
+
+    private void reactMsg(TbContext ctx, TbMsg msg, DoAction action) {
+        //TODO: 场景联动关联消息通知
         String lastMsgQueueName = msg.getQueueName();
         TbMsgMetaData metaData = msg.getMetaData();
         metaData.putValue(DataConstants.IS_CLEARED_ALARM, Boolean.TRUE.toString());
@@ -237,7 +267,7 @@ class ReactState {
                 , msg.getOriginator()
                 , msg != null ? msg.getCustomerId() : null
                 , metaData
-                , JacksonUtil.toString(context));
+                , JacksonUtil.toString(action.getDoContext()));
         ctx.tellNext(newMsg, "Message");
     }
 }
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/TriggerState.java
View file @1afb808
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/TriggerState.java
View file @1afb808
@@ -72,13 +72,15 @@ class TriggerState {
     private DataSnapshot latestValues;
     private final Set<AlarmConditionFilterKey> entityKeys;
+    private final String alarmDetails;
-    TriggerState( String originator, AlarmRule rule,Set<AlarmConditionFilterKey> filterKeys,DynamicPredicateValueCtx dynamicPredicateValueCtx) {
+    TriggerState(String originator, AlarmRule rule, Set<AlarmConditionFilterKey> filterKeys, String alarmDetails, DynamicPredicateValueCtx dynamicPredicateValueCtx) {
         this.originator = originator;
         this.dynamicPredicateValueCtx = dynamicPredicateValueCtx;
-        ruleState = new TriggerRuleState(rule.getCondition(), filterKeys, new PersistedAlarmRuleState(),rule.getSchedule());
+        ruleState = new TriggerRuleState(rule.getCondition(), filterKeys, new PersistedAlarmRuleState(), rule.getSchedule());
         this.entityKeys = filterKeys;
+        this.alarmDetails = alarmDetails;
     }
@@ -88,10 +90,10 @@ class TriggerState {
         }
         lastMsgMetaData = msg.getMetaData();
         SnapshotUpdate update = null;
-        if(msg.getType().equals(SessionMsgType.POST_TELEMETRY_REQUEST.name())){
-            update =  processTelemetry(ctx,msg);
-        }else{
-            update =   processAttributes(ctx,msg);
+        if (msg.getType().equals(SessionMsgType.POST_TELEMETRY_REQUEST.name())) {
+            update = processTelemetry(ctx, msg);
+        } else {
+            update = processAttributes(ctx, msg);
         }
         if (update != null && update.hasUpdate()) {
@@ -101,7 +103,6 @@ class TriggerState {
     }
-
     public boolean process(TbContext ctx, long ts) throws ExecutionException, InterruptedException {
         return createOrClearAlarms(ctx, null, ts, null, (alarmState, tsParam) -> alarmState.eval(tsParam, latestValues));
     }
@@ -142,8 +143,6 @@ class TriggerState {
     }
-
-
     protected void setAlarmConditionMetadata(TriggerRuleState ruleState, TbMsgMetaData metaData) {
         if (ruleState.getSpec().getType() == AlarmConditionSpecType.REPEATING) {
             metaData.putValue(DataConstants.ALARM_CONDITION_REPEATS, String.valueOf(ruleState.getState().getEventCount()));
@@ -154,9 +153,6 @@ class TriggerState {
     }
-
-
-
     public void processAckAlarm(Alarm alarm) {
         if (currentAlarm != null && currentAlarm.getId().equals(alarm.getId())) {
             currentAlarm.setStatus(alarm.getStatus());
@@ -165,16 +161,6 @@ class TriggerState {
     }
-
-
-
-
-
-
-
-
-
-
     protected SnapshotUpdate processAttributes(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException {
         Set<AttributeKvEntry> attributes = JsonConverter.convertToAttributes(new JsonParser().parse(msg.getData()));
         if (!attributes.isEmpty()) {
@@ -188,14 +174,13 @@ class TriggerState {
         for (Map.Entry<Long, List<KvEntry>> entry : tsKvMap.entrySet()) {
             Long ts = entry.getKey();
             List<KvEntry> data = entry.getValue();
-            return merge( ts, data);
+            return merge(ts, data);
         }
         return null;
     }
-
     private DataSnapshot fetchLatestValues(TbContext ctx, String originator) throws ExecutionException, InterruptedException {
         DataSnapshot result = new DataSnapshot(entityKeys);
         addEntityKeysToSnapshot(ctx, originator, result);
@@ -254,6 +239,7 @@ class TriggerState {
             addToSnapshot(result, ctx.getAttributesService().find(ctx.getTenantId(), new DeviceId(UUID.fromString(originator)), DataConstants.SERVER_SCOPE, attributeKeys).get());
         }
     }
+
     private void addToSnapshot(DataSnapshot snapshot, List<AttributeKvEntry> data) {
         for (AttributeKvEntry entry : data) {
             if (entry.getValue() != null) {
@@ -262,6 +248,7 @@ class TriggerState {
             }
         }
     }
+
     public static EntityKeyValue toEntityValue(KvEntry entry) {
         switch (entry.getDataType()) {
             case STRING:
@@ -278,7 +265,8 @@ class TriggerState {
                 throw new RuntimeException("Can't parse entry: " + entry.getDataType());
         }
     }
-    private SnapshotUpdate merge( Long newTs, List<KvEntry> data) {
+
+    private SnapshotUpdate merge(Long newTs, List<KvEntry> data) {
         Set<AlarmConditionFilterKey> keys = new HashSet<>();
         for (KvEntry entry : data) {
             AlarmConditionFilterKey entityKey = new AlarmConditionFilterKey(AlarmConditionKeyType.TIME_SERIES, entry.getKey());