From 6f41666e8bc8debd94c868df7f0ff3497282ec74 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Sat, 11 Jul 2020 15:58:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E4=B8=8B=E6=9C=89=E8=BE=83=E5=A4=9A=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BC=80=E5=90=AF=E4=BA=86=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=B8=AD=E9=98=B2=E6=8A=96=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4=E5=86=85?= =?UTF-8?q?=E5=AD=98=E6=B3=84=E6=BC=8F=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rule/engine/device/DeviceAlarmTaskExecutorProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/device/DeviceAlarmTaskExecutorProvider.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/device/DeviceAlarmTaskExecutorProvider.java index 6bca13e2..ac10ac12 100644 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/device/DeviceAlarmTaskExecutorProvider.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/device/DeviceAlarmTaskExecutorProvider.java @@ -212,8 +212,8 @@ public class DeviceAlarmTaskExecutorProvider implements TaskExecutorProvider { StringUtils.hasText(rule.getDeviceId()) ? flux.window(windowTime)//规则已经指定了固定的设备,直接开启时间窗口就行 : flux //规则配置在设备产品上,则按设备ID分组后再开窗口 - .groupBy(map -> String.valueOf(map.get("deviceId"))) - .flatMap(group -> group.window(windowTime))) + .groupBy(map -> String.valueOf(map.get("deviceId")), Integer.MAX_VALUE) + .flatMap(group -> group.window(windowTime),Integer.MAX_VALUE)) //处理每一组数据 .flatMap(group -> group .index((index, data) -> Tuples.of(index + 1, data)) //给数据打上索引,索引号就是告警次数