From 49afd1f89423b359709083a0fd7008b0914c5597 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Mon, 06 Nov 2017 16:33:58 +0800
Subject: [PATCH] 设置6项数据.
---
src/main/java/com/moral/monitor/listener/TaskListener.java | 2 +-
src/main/resources/system/alarmLevels.json | 24 +++++++++++++++---------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index 558a789..1c47a31 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -160,7 +160,7 @@
double level2 = levels.get("level2");
double level3 = levels.get("level3");
//������������������������������������������
- if(level1!=0&&level2!=0&&level3!=0) {
+ if(levels.get("enable")!=null&&levels.get("enable")==1) {
//������������������
Double arr[] = {0.0,level1,level2,level3};
alarmLevles.put(key, arr);
diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 1924afd..f2ebecb 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -1,13 +1,15 @@
{
"e1":{
- "level1":50,
+ "level1":35,
"level2":115,
- "level3":250
+ "level3":250,
+ "enable":1
},
"e2":{
"level1":50,
"level2":250,
- "level3":420
+ "level3":420,
+ "enable":1
},
"e3":{
"level1":5000,
@@ -47,12 +49,14 @@
"e10":{
"level1":2,
"level2":14,
- "level3":36
+ "level3":36,
+ "enable":1
},
"e11":{
"level1":0.05,
"level2":0.475,
- "level3":1.6
+ "level3":1.6,
+ "enable":1
},
"e12":{
"level1":10000,
@@ -70,14 +74,16 @@
"level3":6
},
"e15":{
- "level1":0.3,
- "level2":0.5,
- "level3":0.8
+ "level1":0.16,
+ "level2":0.3,
+ "level3":0.8,
+ "enable":1
},
"e16":{
"level1":0.04,
"level2":0.18,
- "level3":0.565
+ "level3":0.565,
+ "enable":1
},
"e17":{
"level1":1,
--
Gitblit v1.8.0