fix: 调整场景联动触发判断逻辑及告警详情值

@@ -302,10 +302,13 @@ public class TkNoticeServiceImpl implements TkNoticeService {
       JsonNode jsonNode = objectMapper.readTree(alarmInfo.getDetails());
       Iterator<String> fieldNames = jsonNode.fieldNames();
       while (fieldNames.hasNext()) {
-        String fieldName = fieldNames.next();
-        JsonNode data = jsonNode.get(fieldName);
-        String realValue = JacksonUtil.convertValue(data.path(FastIotConstants.Scene.TRIGGER_DATA).path("realValue"), String.class);
-        params.put("triggerValue", realValue);
+          String fieldName = fieldNames.next();
+          JsonNode data = jsonNode.get(fieldName);
+          if(null !=data.path(FastIotConstants.Scene.TRIGGER_DATA)){
+              String realValue = JacksonUtil.convertValue(data.path(FastIotConstants.Scene.TRIGGER_DATA).path("realValue"), String.class);
+              params.put("triggerValue", realValue);
+              break;
+          }
       }
     } catch (Exception e) {
       log.error(String.format("转换异常【s%】", alarmInfo.getDetails()));

@@ -70,9 +70,9 @@ class ReactState {
   private final CacheManager cacheManager;
   private final Cache cache;
   private TkDeviceService ytDeviceService;
-  private String triggerDevicesKey = "triggerDevices";
+  private String triggerDevicesKey;
 
-  private String currentAlarmsKey = "currentAlarms";
+  private String currentAlarmsKey;
 
   ReactState(String reactId, TbContext ctx, TbSceneReactNodeConfig config) {
     this.reactId = reactId;
@@ -95,10 +95,12 @@ class ReactState {
     this.noticeService = SpringBeanUtils.getBean(TkNoticeService.class);
     this.ytDeviceService = SpringBeanUtils.getBean(TkDeviceService.class);
     this.cache = cacheManager.getCache(FastIotConstants.CacheConfigKey.SCENE_REACT);
+    this.triggerDevicesKey = reactId+ "_triggerDevices";
+    this.currentAlarmsKey = reactId+ "_currentAlarms";
     this.triggerDevices = null == cache.get(triggerDevicesKey)?
-            new ConcurrentHashMap<>():cache.get("triggerDevices",ConcurrentHashMap.class);
+            new ConcurrentHashMap<>():cache.get(triggerDevicesKey,ConcurrentHashMap.class);
     this.currentAlarms = null == cache.get(currentAlarmsKey)?
-            new ConcurrentHashMap<>():cache.get("triggerDevices",ConcurrentHashMap.class);
+            new ConcurrentHashMap<>():cache.get(currentAlarmsKey,ConcurrentHashMap.class);
   }
 
   /**
@@ -133,7 +135,7 @@ class ReactState {
     }else{
       conditionMatched.set(true);
     }
-    cache.put(triggerDevicesKey,triggerDevices);
+
     String msgData = msg.getData();
     if (allowExecuteCondition && conditionMatched.get()) {
       log.debug(String.format("设备【%s】的消息内容【%s】触发动作", deviceId, msgData));
@@ -213,6 +215,17 @@ class ReactState {
                                                                       fresh = true;
                                                                     }
                                                                     triggerResult = triggerState.process(ctx, msg,fresh);
+                                                                    if(fresh){
+                                                                      String triggerKey = deviceId + "_" + matchKey.get();
+                                                                      if(triggerResult){
+                                                                        //放入满足的触发器信息,设备ID+触发关键字
+                                                                        triggerDevices.put(triggerKey,
+                                                                                new TriggerData(msg,detail));
+                                                                        cache.put(triggerDevicesKey,triggerDevices);
+                                                                      }else{
+                                                                        triggerDevices.remove(triggerKey);
+                                                                      }
+                                                                    }
                                                                     ObjectNode result = triggerState.getRuleState().getDetailInform();
                                                                       log.debug(
                                                                               String.format(
@@ -222,7 +235,7 @@ class ReactState {
                                                                                       devId,
                                                                                       msg.getOriginator(),
                                                                                       msg.getData()));
-                                                                      if (!result.isEmpty() && triggerResult) {
+                                                                      if (!result.isEmpty() && triggerResult && fresh) {
                                                                           ObjectNode triggerData = JacksonUtil.newObjectNode();
                                                                           triggerData.put(FastIotConstants.Scene.TRIGGER_DATA,result);
                                                                           detail.set(devId,triggerData);
@@ -243,9 +256,6 @@ class ReactState {
                                                               });
                                       if(matched){
                                           triggerMatched.set(matched);
-                                        //放入满足的触发器信息,设备ID+触发关键字
-                                        triggerDevices.put(deviceId + "_" + matchKey.get(),
-                                                new TriggerData(msg,detail));
                                       }
                                   });
                       });