From 47975b0da2f419c6c62fbc543053b4931ca02163 Mon Sep 17 00:00:00 2001 From: tancong <130981800+tancongsir@users.noreply.github.com> Date: Mon, 13 Nov 2023 19:03:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=91=8A=E8=AD=A6=E6=A8=A1=E5=9D=97):=20?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=EF=BC=8C=E6=AF=8F=E4=B8=AA=E5=9C=BA=E6=99=AF=E8=81=94=E5=8A=A8?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E4=B8=80=E6=9D=A1=E5=91=8A=E8=AD=A6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=82=E5=91=8A=E8=AD=A6=E6=97=A5=E5=BF=97=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=91=8A=E8=AD=A6=E8=AF=B4=E6=98=8E=20(#441)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jetlinks/community/rule/engine/alarm/AlarmConstants.java | 1 + .../community/rule/engine/alarm/AlarmRuleHandler.java | 3 +++ .../community/rule/engine/alarm/DefaultAlarmRuleHandler.java | 5 ++++- .../community/rule/engine/alarm/OtherAlarmTarget.java | 2 +- .../community/rule/engine/entity/AlarmConfigEntity.java | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmConstants.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmConstants.java index f6a44201..f34e3c71 100644 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmConstants.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmConstants.java @@ -9,6 +9,7 @@ public interface AlarmConstants { String alarmName = "alarmName"; String level = "level"; String ownerId = "ownerId"; + String description = "description"; String state = "state"; String alarmTime = "alarmTime"; String lastAlarmTime = "lastAlarmTime"; diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmRuleHandler.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmRuleHandler.java index 886677f9..5ac0bb3c 100644 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmRuleHandler.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/AlarmRuleHandler.java @@ -55,6 +55,9 @@ public interface AlarmRuleHandler { @Schema(description = "告警名称") private String alarmName; + @Schema(description = "告警说明") + private String description; + @Schema(description = "是否重复告警") private boolean alarming; diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmRuleHandler.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmRuleHandler.java index a927a9de..bcead2c0 100644 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmRuleHandler.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/DefaultAlarmRuleHandler.java @@ -64,7 +64,8 @@ public class DefaultAlarmRuleHandler implements AlarmRuleHandler, CommandLineRun AlarmConstants.ConfigKey.level, AlarmConstants.ConfigKey.targetType, AlarmConstants.ConfigKey.state, - AlarmConstants.ConfigKey.ownerId + AlarmConstants.ConfigKey.ownerId, + AlarmConstants.ConfigKey.description )); private final Map, Set> ruleAlarmBinds = new ConcurrentHashMap<>(); @@ -159,6 +160,7 @@ public class DefaultAlarmRuleHandler implements AlarmRuleHandler, CommandLineRun entity.setSourceId(result.getSourceId()); entity.setAlarmName(result.getAlarmName()); + entity.setDescription(result.getDescription()); entity.generateId(); return entity; } @@ -280,6 +282,7 @@ public class DefaultAlarmRuleHandler implements AlarmRuleHandler, CommandLineRun info.setId(IDGenerator.RANDOM.generate()); info.setAlarmConfigId(record.getAlarmConfigId()); info.setAlarmConfigName(record.getAlarmName()); + info.setDescription(record.getDescription()); info.setAlarmRecordId(record.getId()); info.setLevel(record.getLevel()); info.setAlarmTime(record.getAlarmTime()); diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/OtherAlarmTarget.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/OtherAlarmTarget.java index 509e3bc7..4e81cd2f 100644 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/OtherAlarmTarget.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/alarm/OtherAlarmTarget.java @@ -21,7 +21,7 @@ public class OtherAlarmTarget implements AlarmTarget { @Override public Flux convert(AlarmData data) { return Flux.just(AlarmTargetInfo - .of(data.getAlarmConfigId(), + .of(data.getRuleId(), data.getRuleName(), getType())); } diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/entity/AlarmConfigEntity.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/entity/AlarmConfigEntity.java index 643f5d3a..10269369 100755 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/entity/AlarmConfigEntity.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/entity/AlarmConfigEntity.java @@ -105,7 +105,7 @@ public class AlarmConfigEntity extends GenericEntity implements RecordCr configs.put(AlarmConstants.ConfigKey.ownerId, getModifierId() == null ? getCreatorId() : getModifierId()); configs.put(AlarmConstants.ConfigKey.targetType, getTargetType()); configs.put(AlarmConstants.ConfigKey.state, getState().name()); - + configs.put(AlarmConstants.ConfigKey.description, getDescription()); return configs; } }