From 8cae9a395ea235ad1dc5d251b3aed33b699df4b2 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 6 Dec 2022 11:16:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/protocol/LazyInitManagementProtocolSupports.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jetlinks-components/protocol-component/src/main/java/org/jetlinks/community/protocol/LazyInitManagementProtocolSupports.java b/jetlinks-components/protocol-component/src/main/java/org/jetlinks/community/protocol/LazyInitManagementProtocolSupports.java index 09909426..9fd62700 100755 --- a/jetlinks-components/protocol-component/src/main/java/org/jetlinks/community/protocol/LazyInitManagementProtocolSupports.java +++ b/jetlinks-components/protocol-component/src/main/java/org/jetlinks/community/protocol/LazyInitManagementProtocolSupports.java @@ -11,6 +11,8 @@ import org.jetlinks.supports.protocol.management.ProtocolSupportDefinition; import org.jetlinks.supports.protocol.management.ProtocolSupportLoader; import org.jetlinks.supports.protocol.management.ProtocolSupportManager; import org.springframework.boot.CommandLineRunner; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; import reactor.core.publisher.Mono; import java.time.Duration; @@ -21,6 +23,7 @@ import java.util.function.Consumer; @Slf4j @Getter @Setter +@Order(Ordered.HIGHEST_PRECEDENCE) public class LazyInitManagementProtocolSupports extends StaticProtocolSupports implements CommandLineRunner { private ProtocolSupportManager manager; From d24ba36dc02b692ff8766914270a5b8d7291693f Mon Sep 17 00:00:00 2001 From: zhouhao Date: Mon, 12 Dec 2022 14:11:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rule/engine/service/ElasticSearchAlarmHistoryService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/service/ElasticSearchAlarmHistoryService.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/service/ElasticSearchAlarmHistoryService.java index 94dbde0f..c5a2b689 100644 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/service/ElasticSearchAlarmHistoryService.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/service/ElasticSearchAlarmHistoryService.java @@ -52,13 +52,12 @@ public class ElasticSearchAlarmHistoryService implements AlarmHistoryService { .addProperty("alarmRecordId", StringType.GLOBAL) .addProperty("level", IntType.GLOBAL) .addProperty("description", StringType.GLOBAL) - .addProperty("alarmTime", LongType.GLOBAL) + .addProperty("alarmTime", DateTimeType.GLOBAL) .addProperty("targetType", StringType.GLOBAL) .addProperty("targetName", StringType.GLOBAL) .addProperty("targetId", StringType.GLOBAL) .addProperty("alarmInfo", StringType.GLOBAL) .addProperty("creatorId", StringType.GLOBAL) - .addProperty("bindings", new ArrayType().elementType(new ObjectType())) ).block(Duration.ofSeconds(10)); } } From 6fd335c84a4b7fe97e126a11f599132c20ea8f2e Mon Sep 17 00:00:00 2001 From: zhouhao Date: Mon, 12 Dec 2022 14:13:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rule/engine/entity/AlarmHistoryInfo.java | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/entity/AlarmHistoryInfo.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/entity/AlarmHistoryInfo.java index f893aef4..e65de7ae 100755 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/entity/AlarmHistoryInfo.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/entity/AlarmHistoryInfo.java @@ -46,9 +46,6 @@ public class AlarmHistoryInfo { @Schema(description = "告警信息") private String alarmInfo; - @Schema(description = "绑定信息") - private List> bindings; - public static AlarmHistoryInfo of(String alarmRecordId, AlarmTargetInfo targetInfo, @@ -66,31 +63,7 @@ public class AlarmHistoryInfo { info.setTargetType(targetInfo.getTargetType()); info.setAlarmInfo(JSON.toJSONString(data.getOutput())); info.setDescription(alarmConfig.getDescription()); - info.setBindings(convertBindings(targetInfo, data, alarmConfig)); return info; } - @SuppressWarnings("all") - static List> convertBindings(AlarmTargetInfo targetInfo, - SceneData data, - AlarmConfigEntity alarmConfig){ - List> bindings = new ArrayList<>(); - - bindings.addAll((List) data.getOutput().getOrDefault("_bindings",Collections.emptyList())); - - //添加告警配置创建人到bindings中。作为用户维度信息 - Map userDimension = new HashMap<>(2); - userDimension.put("type","user"); - userDimension.put("id", alarmConfig.getCreatorId()); - bindings.add(userDimension); - //添加组织纬度信息 - if ("org".equals(alarmConfig.getTargetType())) { - Map orgDimension = new HashMap<>(2); - userDimension.put("type", targetInfo.getTargetType()); - userDimension.put("id", targetInfo.getTargetId()); - bindings.add(userDimension); - } - return bindings; - } - }