fix: 告警清除DTO对象调整

@@ -23,6 +23,6 @@ public class ActionAlarmDTO extends TenantDTO {
     private AlarmSeverity alarmLevel;
 
 
-    private AlarmRule clearRule;
+    private TriggerDTO clearRule;
 
 }

@@ -3,22 +3,20 @@ package org.thingsboard.server.common.data.yunteng.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
-import org.thingsboard.server.common.data.device.profile.AlarmSchedule;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 
 import java.util.List;
 
 /**
- * @Description  场景联动触发器数据传输表
+ * @Description 场景联动触发器数据传输表
  * @Author cxy
  * @Date 2021/11/24 17:32
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class TriggerDTO extends TenantDTO{
+public class TriggerDTO extends TenantDTO {
 
     @ApiModelProperty(value = "触发器类型")
     private TriggerTypeEnum triggerType;
@@ -31,7 +29,6 @@ public class TriggerDTO extends TenantDTO{
     private AlarmRule triggerCondition;
 
 
-
     @ApiModelProperty(value = "场景联动id")
     private String sceneLinkageId;
 

@@ -5,25 +5,18 @@ package org.thingsboard.rule.engine.yunteng.scene;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
-import org.thingsboard.common.util.DonAsynchron;
-import org.thingsboard.rule.engine.action.TbAlarmResult;
 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.alarm.AlarmStatus;
-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.id.DeviceId;
-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.DoActionDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TriggerDTO;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
@@ -31,13 +24,14 @@ import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.ServiceQueue;
-import org.thingsboard.server.dao.alarm.AlarmOperationResult;
 import org.thingsboard.server.dao.yunteng.entities.DoAction;
 import org.thingsboard.server.dao.yunteng.entities.DoCondition;
 import org.thingsboard.server.dao.yunteng.service.*;
 
-import java.net.InetAddress;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 
@@ -68,7 +62,7 @@ class ReactState {
      * 键：设备ID为键
      * 值：设备最新告警信息
      */
-    private ConcurrentHashMap<String, Alarm> currentAlarms =new ConcurrentHashMap<>();
+    private ConcurrentHashMap<String, Alarm> currentAlarms = new ConcurrentHashMap<>();
 
     /**
      * 场景联动的执行条件状态
@@ -92,7 +86,6 @@ class ReactState {
     private YtDeviceService ytDeviceService;
 
 
-
     ReactState(String reactId, TbContext ctx, TbSceneReactNodeConfig config) {
         this.reactId = reactId;
         this.reactName = config.getNames().get(reactId);
@@ -102,9 +95,9 @@ class ReactState {
         this.conditions = conditionService.getConditions(reactId);
         DoActionService actionService = SpringBeanUtils.getBean(DoActionService.class);
         this.actions = actionService.getActions(reactId);
-        for(DoAction action: actions){
+        for (DoAction action : actions) {
             /**动作中只有1个告警通知*/
-            if(ActionTypeEnum.MSG_NOTIFY.equals(action.getOutTarget())){
+            if (ActionTypeEnum.MSG_NOTIFY.equals(action.getOutTarget())) {
                 this.alarmAction = action;
                 break;
             }
@@ -132,10 +125,10 @@ class ReactState {
                 matched = triggerState.process(ctx, msg);
                 if (matched) {
                     detail.append(triggerState.getAlarmDetails());
-                    if(this.alarmAction != null){
-                        noticeMsg(ctx, msg, alarmAction,deviceId,triggerState.getAlarmDetails(),triggerState.getLatestValues().getTs());
+                    if (this.alarmAction != null) {
+                        noticeMsg(ctx, msg, alarmAction, deviceId, triggerState.getAlarmDetails(), triggerState.getLatestValues().getTs());
                     }
-                }else if(currentAlarms.containsKey(deviceId) && this.alarmAction != null){
+                } else if (currentAlarms.containsKey(deviceId) && this.alarmAction != null) {
                     //清除设备告警
                     clearAlarm(ctx, msg, deviceId);
                 }
@@ -169,10 +162,10 @@ class ReactState {
 
         if (matched) {
             for (DoAction item : actions) {
-                if(ActionTypeEnum.MSG_NOTIFY.equals(item.getOutTarget())){
+                if (ActionTypeEnum.MSG_NOTIFY.equals(item.getOutTarget())) {
                     continue;
                 }
-                pushMsg(ctx, msg, item,detail.toString());
+                pushMsg(ctx, msg, item, detail.toString());
             }
         } else {
             ctx.tellSuccess(msg);
@@ -201,9 +194,9 @@ class ReactState {
             return triggerState.get(deviceId);
         }
         if (alarmAction.getDeviceId().contains(deviceId)) {
-            ActionAlarmDTO alarm = JacksonUtil.convertValue(alarmAction.getDoContext(),ActionAlarmDTO.class);
-            if(alarm != null && alarm.getClearRule()!=null){
-                TriggerState state = createTriggerState(deviceId, alarm.getClearRule());
+            ActionAlarmDTO alarm = JacksonUtil.convertValue(alarmAction.getDoContext(), ActionAlarmDTO.class);
+            if (alarm != null && alarm.getClearRule() != null) {
+                TriggerState state = createTriggerState(deviceId, alarm.getClearRule().getTriggerCondition());
                 triggerState.put(deviceId, state);
                 return state;
             }
@@ -230,12 +223,12 @@ class ReactState {
         for (AlarmConditionFilter filter : rule.getCondition().getCondition()) {
             filterKeys.add(filter.getKey());
         }
-        TriggerState state = new TriggerState(deviceId, rule, filterKeys, rule.getAlarmDetails(),null);
+        TriggerState state = new TriggerState(deviceId, rule, filterKeys, rule.getAlarmDetails(), null);
 
         return state;
     }
 
-    private void pushMsg(TbContext ctx, TbMsg msg, DoAction action,String detail) {
+    private void pushMsg(TbContext ctx, TbMsg msg, DoAction action, String detail) {
         TbMsgMetaData metaData = //lastMsgMetaData != null ? lastMsgMetaData.copy() :
                 new TbMsgMetaData();
         String relationType = "";
@@ -282,10 +275,10 @@ class ReactState {
      * @param msg
      * @param action
      */
-    private void noticeMsg(TbContext ctx, TbMsg msg, DoAction action,String deviceId,String detailStr,long startTs) {
+    private void noticeMsg(TbContext ctx, TbMsg msg, DoAction action, String deviceId, String detailStr, long startTs) {
 
         DeviceId entityId = new DeviceId(UUID.fromString(deviceId));
-        ActionAlarmDTO actionAlarm = JacksonUtil.convertValue(action.getDoContext(),ActionAlarmDTO.class);
+        ActionAlarmDTO actionAlarm = JacksonUtil.convertValue(action.getDoContext(), ActionAlarmDTO.class);
 
 
         Alarm currentAlarm = new Alarm();
@@ -298,8 +291,8 @@ class ReactState {
         currentAlarm.setStartTs(startTs);
         currentAlarm.setEndTs(currentAlarm.getStartTs());
         ObjectNode detailData = JacksonUtil.newObjectNode();
-        detailData.put("msg",detailStr);
-        detailData.put("data",JacksonUtil.toJsonNode(msg.getData()));
+        detailData.put("msg", detailStr);
+        detailData.put("data", JacksonUtil.toJsonNode(msg.getData()));
         currentAlarm.setDetails(detailData);
         currentAlarm.setOriginator(entityId);
         currentAlarm.setTenantId(ctx.getTenantId());
@@ -307,8 +300,7 @@ class ReactState {
 
         currentAlarm = ctx.getAlarmService().createOrUpdateAlarm(currentAlarm);
         ytDeviceService.freshAlarmStatus(entityId, 1);
-        currentAlarms.put(deviceId,currentAlarm);
-
+        currentAlarms.put(deviceId, currentAlarm);
 
 
         AlarmInfoDTO formData = new AlarmInfoDTO();
@@ -322,12 +314,12 @@ class ReactState {
         formData.setDeviceId(deviceId);
         formData.setTenantId(currentAlarm.getTenantId().getId().toString());
         formData.setSeverity(actionAlarm.getAlarmLevel().name());
-        noticeService.alert(action.getAlarmProfileId(),formData);
+        noticeService.alert(action.getAlarmProfileId(), formData);
     }
 
-    private void clearAlarm(TbContext ctx, TbMsg msg,String deviceId) throws ExecutionException, InterruptedException {
-        TriggerState clearStete = getOrCreateClearState(deviceId);
-        if(clearStete.process(ctx, msg)){
+    private void clearAlarm(TbContext ctx, TbMsg msg, String deviceId) throws ExecutionException, InterruptedException {
+        TriggerState clearState = getOrCreateClearState(deviceId);
+        if (clearState.process(ctx, msg)) {
             ctx.getAlarmService().clearAlarmForResult(ctx.getTenantId(), currentAlarms.get(deviceId).getId(), null, System.currentTimeMillis());
             ytDeviceService.freshAlarmStatus(new DeviceId(UUID.fromString(deviceId)), 0);
             currentAlarms.remove(deviceId);