From 73313ad2f1c1397985e2f6dfd3bb75c4fb261b4a Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 26 五月 2021 09:44:05 +0800
Subject: [PATCH] 更新告警规则阈值范围接口
---
src/main/java/com/whyc/service/AlarmRuleService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/AlarmRuleService.java b/src/main/java/com/whyc/service/AlarmRuleService.java
index 438a352..2ca8370 100644
--- a/src/main/java/com/whyc/service/AlarmRuleService.java
+++ b/src/main/java/com/whyc/service/AlarmRuleService.java
@@ -58,6 +58,8 @@
/**
* 鎻愬墠鏍￠獙,濡傛灉搴撲腑瀛樺湪 鍚� 璁惧&瀛楁&闃堝�兼爣璇�
* 鐨勬暟鎹�,鍒欓渶瑕佹牴鎹綋鍓嶉�夋嫨鐨勭骇鍒�,缁欏嚭闃堝��
+ *
+ * 濡傛灉鏁版嵁搴撲腑宸茬粡瀛樺湪褰撳墠浼犲叆鐨勭骇鍒�,璇存槑褰撳墠鏄紪杈戞椂淇敼闃堝��,鏁呭厛鎺掗櫎褰撳墠绾у埆鐨勫��
* @param alarmRule
* @return
*/
@@ -74,7 +76,10 @@
if(alarmRule.getThresholdFlag()==2) {
listWithSameThreshold.stream().forEach(alarmRuleLevel -> {
- if (alarmRule.getLevel() > alarmRuleLevel.getLevel()) {
+ if(alarmRule.getLevel()==alarmRuleLevel.getLevel()){
+ //濡傛灉鍛婅绾у埆鐩哥瓑,涓嶆惡甯︽暟鎹綔鍙傝��,杩欓噷蹇呭畾鏄紪杈戞椂鐨勯槇鍊艰寖鍥磋幏鍙�
+ }
+ else if (alarmRule.getLevel() > alarmRuleLevel.getLevel()) {
if (belowCloserLevel[0][0] != null) {
if ((Integer) (belowCloserLevel[0][0]) < alarmRuleLevel.getLevel()) {
belowCloserLevel[0][0] = alarmRuleLevel.getLevel();
@@ -100,7 +105,10 @@
thresholdValueRange.add(aboveCloserLevel[0][1]);
}else{
listWithSameThreshold.stream().forEach(alarmRuleLevel -> {
- if (alarmRule.getLevel() > alarmRuleLevel.getLevel()) {
+ if(alarmRule.getLevel()==alarmRuleLevel.getLevel()){
+ //濡傛灉鍛婅绾у埆鐩哥瓑,涓嶆惡甯︽暟鎹綔鍙傝��,杩欓噷蹇呭畾鏄紪杈戞椂鐨勯槇鍊艰寖鍥磋幏鍙�
+ }
+ else if (alarmRule.getLevel() > alarmRuleLevel.getLevel()) {
if (belowCloserLevel[0][0] != null) {
if ((Integer) (belowCloserLevel[0][0]) < alarmRuleLevel.getLevel()) {
belowCloserLevel[0][0] = alarmRuleLevel.getLevel();
--
Gitblit v1.9.1