suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10 from jetlinks/master 

修复一个产品下有较多设备时，开启了设备告警中防抖配置时，可能导致内存泄漏问题。
This commit is contained in:
老周 2020-07-13 09:43:58 +08:00 committed by GitHub
parent c8daf3d7b7 6f41666e8b
commit dd704f75f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/device/DeviceAlarmTaskExecutorProvider.java
View File

@ -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)) //给数据打上索引,索引号就是告警次数