Merge branch '20220318' into 'master'

refactor: 场景联动触发设备告警

See merge request huang/thingsboard3.3.2!68

@@ -424,8 +424,10 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
                         .eq(SceneLinkage::getStatus, FastIotConstants.StateValue.ENABLE)
         );
         Set<String> enableIds = new HashSet<>();
+        Map<String, String> sceneInform = new HashMap<>();
         for (SceneLinkage item : runningScenes) {
             enableIds.add(item.getId());
+            sceneInform.put(item.getId(),item.getName());
         }
         enableIds.add(currentSceneId);
         if (state == FastIotConstants.StateValue.DISABLE) {
@@ -488,6 +490,9 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
 
         Map<String, Map> engineConfig = new HashMap<>();
         engineConfig.put("scenes", matchedDevices);
+        engineConfig.put("names", sceneInform);
+
+
 
 
         return JacksonUtil.convertValue(engineConfig, JsonNode.class);

@@ -4,31 +4,37 @@
 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;
 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.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 org.thingsboard.server.dao.yunteng.service.*;
 
 import java.net.InetAddress;
 import java.util.*;
@@ -42,25 +48,38 @@ class ReactState {
      * 场景联动主键
      */
     String reactId;
+    String reactName;
 
     /**
      * 场景联动的触发器状态
-     * 键：设备主键
+     * 键：触发器ID和设备ID为键
      * 值：设备指标参与的触发器
      */
     private ConcurrentHashMap<String, TriggerState> triggerState = new ConcurrentHashMap<>();
 
+    /**
+     * 场景联动的告警清除触发器状态
+     * 键：设备ID为键
+     * 值：设备指标参与的触发器
+     */
     private ConcurrentHashMap<String, TriggerState> clearState = new ConcurrentHashMap<>();
+    /**
+     * 设备告警信息
+     * 键：设备ID为键
+     * 值：设备最新告警信息
+     */
+    private ConcurrentHashMap<String, Alarm> currentAlarms;
 
     /**
      * 场景联动的执行条件状态
-     * 键：设备主键
+     * 键：触发器ID和设备ID为键
      * 值：设备指标参与的触发器
      */
     private ConcurrentHashMap<String, TriggerState> conditionState = new ConcurrentHashMap<>();
 
 
     private final List<TriggerDTO> triggers;
+    private DoAction alarmAction = null;
     /**
      * 【场景联动的执行条件】懒加载
      */
@@ -70,21 +89,28 @@ class ReactState {
      */
     private final List<DoAction> actions;
     private final YtNoticeService noticeService;
+    private YtDeviceService ytDeviceService;
 
 
-    private RuleNodeState state;
-
 
     ReactState(String reactId, TbContext ctx, TbSceneReactNodeConfig config) {
         this.reactId = reactId;
+        this.reactName = config.getNames().get(reactId);
         TriggerService triggerService = SpringBeanUtils.getBean(TriggerService.class);
         this.triggers = triggerService.getTrigger(reactId);
         DoConditionService conditionService = SpringBeanUtils.getBean(DoConditionService.class);
         this.conditions = conditionService.getConditions(reactId);
         DoActionService actionService = SpringBeanUtils.getBean(DoActionService.class);
         this.actions = actionService.getActions(reactId);
+        for(DoAction action: actions){
+            /**动作中只有1个告警通知*/
+            if(ActionTypeEnum.MSG_NOTIFY.equals(action.getOutTarget())){
+                this.alarmAction = action;
+                break;
+            }
+        }
         this.noticeService = SpringBeanUtils.getBean(YtNoticeService.class);
-
+        this.ytDeviceService = SpringBeanUtils.getBean(YtDeviceService.class);
     }
 
 
@@ -106,7 +132,12 @@ class ReactState {
                 matched = triggerState.process(ctx, msg);
                 if (matched) {
                     detail.append(triggerState.getAlarmDetails());
-                    break;
+                    if(this.alarmAction != null){
+                        noticeMsg(ctx, msg, alarmAction,deviceId,triggerState.getAlarmDetails(),triggerState.getLatestValues().getTs());
+                    }
+                }else if(currentAlarms.containsKey(deviceId) && this.alarmAction != null){
+                    //清除设备告警
+                    clearAlarm(ctx, msg, deviceId);
                 }
             }
         }
@@ -138,6 +169,9 @@ class ReactState {
 
         if (matched) {
             for (DoAction item : actions) {
+                if(ActionTypeEnum.MSG_NOTIFY.equals(item.getOutTarget())){
+                    continue;
+                }
                 pushMsg(ctx, msg, item,detail.toString());
             }
         } else {
@@ -162,6 +196,22 @@ class ReactState {
 
     }
 
+    protected TriggerState getOrCreateClearState(String deviceId) {
+        if (triggerState.containsKey(deviceId)) {
+            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());
+                triggerState.put(deviceId, state);
+                return state;
+            }
+        }
+        return null;
+
+    }
+
     protected TriggerState getOrCreateConditionState(String conditionId, String deviceId, AlarmRule condition) {
         String cacheKey = conditionId + deviceId;
         if (conditionState.containsKey(cacheKey)) {
@@ -197,9 +247,6 @@ class ReactState {
             case SCENE_ACT:
                 reactMsg(ctx, msg, action);
                 break;
-            case MSG_NOTIFY:
-                noticeMsg(ctx, msg, action,detail);
-                break;
             default:
                 ctx.tellSuccess(msg);
                 break;
@@ -235,28 +282,59 @@ class ReactState {
      * @param msg
      * @param action
      */
-    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();
+    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);
 
 
+        Alarm currentAlarm = new Alarm();
+        currentAlarm.setType(reactName);
+        currentAlarm.setStatus(AlarmStatus.ACTIVE_UNACK);
+        currentAlarm.setSeverity(actionAlarm.getAlarmLevel());
+        if (startTs == 0L) {
+            startTs = System.currentTimeMillis();
+        }
+        currentAlarm.setStartTs(startTs);
+        currentAlarm.setEndTs(currentAlarm.getStartTs());
+        ObjectNode detailData = JacksonUtil.newObjectNode();
+        detailData.put("msg",detailStr);
+        detailData.put("data",JacksonUtil.toJsonNode(msg.getData()));
+        currentAlarm.setDetails(detailData);
+        currentAlarm.setOriginator(entityId);
+        currentAlarm.setTenantId(ctx.getTenantId());
+        currentAlarm.setPropagate(false);
+
+        currentAlarm = ctx.getAlarmService().createOrUpdateAlarm(currentAlarm);
+        ytDeviceService.freshAlarmStatus(entityId, 1);
+        currentAlarms.put(deviceId,currentAlarm);
+
+
+
         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.setDetails(JacksonUtil.toString(detailData));
+        formData.setType(currentAlarm.getType());
+        formData.setCreateTs(currentAlarm.getCreatedTime());
+        formData.setStartTs(currentAlarm.getStartTs());
+        formData.setEndTs(currentAlarm.getEndTs());
+        formData.setStatus(currentAlarm.getStatus().name());
         formData.setDeviceId(deviceId);
-        formData.setTenantId(tenantId);
+        formData.setTenantId(currentAlarm.getTenantId().getId().toString());
         formData.setSeverity(actionAlarm.getAlarmLevel().name());
         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)){
+            ctx.getAlarmService().clearAlarmForResult(ctx.getTenantId(), currentAlarms.get(deviceId).getId(), null, System.currentTimeMillis());
+            ytDeviceService.freshAlarmStatus(new DeviceId(UUID.fromString(deviceId)), 0);
+            currentAlarms.remove(deviceId);
+        }
+    }
+
+
     private void reactMsg(TbContext ctx, TbMsg msg, DoAction action) {
         //TODO: 场景联动关联消息通知
         String lastMsgQueueName = msg.getQueueName();

@@ -17,6 +17,8 @@ public class TbSceneReactNodeConfig implements NodeConfiguration<TbSceneReactNod
 
     /**【设备ID,场景】设备的哪些指标会触发场景联动*/
     private Map<String, List<String>> scenes;
+    /**【场景ID,场景名称】场景联动信息*/
+    private Map<String, String> names;
 
 
 
@@ -27,6 +29,7 @@ public class TbSceneReactNodeConfig implements NodeConfiguration<TbSceneReactNod
         TbSceneReactNodeConfig config = new TbSceneReactNodeConfig();
         Map<String, List<String>> sceneMap = new HashMap<>();
         config.setScenes(sceneMap);
+        config.setNames(new HashMap<>());
         return config;
     }
 }