Commit 7913ca242577fe13879657162387ddb4eb2e70fe

Authored by 云中非
1 parent 0246ee68

refactor: 多触发器设备输出兼容问题

... ... @@ -117,18 +117,19 @@ class ReactState {
117 117 ctx.tellSuccess(msg);
118 118 }
119 119
120   - boolean matched;
  120 + boolean matched = false;
121 121 if (triggers == null || triggers.isEmpty()) {
122 122 matched = true;
123 123 } else {
124   - matched = false;
  124 + boolean itemMatched = false;
125 125 for (TriggerDTO trigger : triggers) {
126 126 TriggerState triggerState = getOrCreateTriggerState(trigger, deviceId);
127 127 if (triggerState == null) {
128 128 continue;
129 129 }
130   - matched = triggerState.process(ctx, msg);
131   - if (matched) {
  130 + itemMatched = triggerState.process(ctx, msg);
  131 + if (itemMatched) {
  132 + matched = true;
132 133 detail.append(triggerState.getAlarmDetails());
133 134 if (this.alarmAction != null) {
134 135 noticeMsg(ctx, msg, alarmAction, deviceId, triggerState.getAlarmDetails(), triggerState.getLatestValues().getTs());
... ...