fix:报警日志绑定当前报警规则,非最新规则
This commit is contained in:
parent
fd2c65209c
commit
699a8b068b
|
@ -47,6 +47,12 @@ public class AlarmLog implements Serializable {
|
||||||
@TableField(value = "alarm_value")
|
@TableField(value = "alarm_value")
|
||||||
private String alarmValue;
|
private String alarmValue;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 当前的规则信息
|
||||||
|
*/
|
||||||
|
@TableField(value = "operator")
|
||||||
|
private String operator;
|
||||||
|
|
||||||
public AlarmLog() {
|
public AlarmLog() {
|
||||||
this.alarmStartDate = LocalDateTime.now();
|
this.alarmStartDate = LocalDateTime.now();
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
l.alarm_start_date,
|
l.alarm_start_date,
|
||||||
l.alarm_info,
|
l.alarm_info,
|
||||||
l.alarm_value,
|
l.alarm_value,
|
||||||
r.OPERATOR,
|
l.OPERATOR,
|
||||||
r.source_type,
|
r.source_type,
|
||||||
CASE
|
CASE
|
||||||
r.source_type
|
r.source_type
|
||||||
|
|
|
@ -100,6 +100,7 @@ public class SysInfoJob implements Job {
|
||||||
// 记录报警日志
|
// 记录报警日志
|
||||||
AlarmLog alarmLog = new AlarmLog();
|
AlarmLog alarmLog = new AlarmLog();
|
||||||
alarmLog.setRuleId(ruleId);
|
alarmLog.setRuleId(ruleId);
|
||||||
|
alarmLog.setOperator(operator);
|
||||||
alarmLog.setAlarmValue(StrUtil.toString(current));
|
alarmLog.setAlarmValue(StrUtil.toString(current));
|
||||||
String ruleName = alarmRule.getName();
|
String ruleName = alarmRule.getName();
|
||||||
Double threshold = rule.getThreshold();
|
Double threshold = rule.getThreshold();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user