From ff93ecd1f2cb4c5ae8459430dd3e09fedad0e3ea Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:53:04 +0800
Subject: [PATCH] device 增加 过滤 为删除条件 修复

---
 src/main/resources/system/alarmLevels.json |  256 ++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 180 insertions(+), 76 deletions(-)

diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 5ff876f..4d9dddd 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -1,97 +1,201 @@
 {
-    "e1":{
-        "level1":35,
-        "level2":115,
-        "level3":250
+  "alarmMode": {
+    "enable": 0,
+    "interval":1440,
+    "level1": [],
+    "level2": [],
+    "level3": []
+  },
+  "alarmLevels": {
+    "e1": {
+      "enable": 1,
+      "increment": [
+        35,
+        115,
+        250
+      ],  
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e2":{
-        "level1":50,
-        "level2":250,
-        "level3":420
+    "e2": {
+      "enable": 1,
+      "increment": [
+        50,
+        250,
+        420
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e3":{
-        "level1":2000,
-        "level2":5000,
-        "level3":8000
+    "e3": {
+      "enable": 0,
+      "increment": [
+        20000,
+        30000,
+        40000
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e4":{
-        "level1":10,
-        "level2":30,
-        "level3":60
+    "e4": {
+      "enable": 0,
+      "increment": [
+        30,
+        75,
+        100
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e5":{
-        "level1":0.01,
-        "level2":0.02,
-        "level3":0.05
+    "e5": {
+      "enable": 0,
+      "increment": [
+        0.1,
+        0.5,
+        1
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e6":{
-        "level1":60,
-        "level2":100,
-        "level3":160
+    "e6": {
+      "enable": 0,
+      "increment": [
+        60,
+        100,
+        160
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e7":{
-        "level1":35,
-        "level2":30,
-        "level3":40
+    "e7": {
+      "enable": 0,
+      "increment": [
+        25,
+        30,
+        60
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e8":{
-        "level1":30,
-        "level2":40,
-        "level3":50
+    "e8": {
+      "enable": 0,
+      "increment": [
+        30,
+        40,
+        50
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e9":{
-        "level1":0.01,
-        "level2":0.02,
-        "level3":0.03
+    "e9": {
+      "enable": 0,
+      "increment": [
+        100,
+        500,
+        1000
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e10":{
-        "level1":2,
-        "level2":14,
-        "level3":36
+    "e10": {
+      "enable": 1,
+      "increment": [
+        2,
+        14,
+        36
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e11":{
-        "level1":0.05,
-        "level2":0.475,
-        "level3":1.6
+    "e11": {
+      "enable": 1,
+      "increment": [
+        50,
+        475,
+        1600
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e12":{
-        "level1":10000,
-        "level2":15000,
-        "level3":25000
+    "e12": {
+      "enable": 0,
+      "increment": [
+        10000,
+        15000,
+        20000
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e13":{
-        "level1":30,
-        "level2":50,
-        "level3":90
+    "e13": {
+      "enable": 0,
+      "increment": [
+        60,
+        90,
+        120
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e14":{
-        "level1":2,
-        "level2":4,
-        "level3":6
+    "e14": {
+      "enable": 0,
+      "increment": [
+        100,
+        200,
+        300
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e15":{
-        "level1":0.16,
-        "level2":0.3,
-        "level3":0.8
+    "e15": {
+      "enable": 1,
+      "increment": [
+        160,
+        300,
+        800
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e16":{
-        "level1":0.04,
-        "level2":0.18,
-        "level3":0.565
+    "e16": {
+      "enable": 1,
+      "increment": [
+        40,
+        180,
+        565
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e17":{
-        "level1":1,
-        "level2":2,
-        "level3":5
+    "e17": {
+      "enable": 0,
+      "increment": [
+        1.5,
+        3,
+        5
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e18":{
-        "level1":5,
-        "level2":6,
-        "level3":8
+    "e18": {
+      "enable": 0,
+      "increment": [
+        5,
+        6,
+        8
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     },
-    "e19":{
-        "level1":480,
-        "level2":580,
-        "level3":680
+    "e19": {
+      "enable": 0,
+      "increment": [
+        3000,
+        4000,
+        5000
+      ],
+      "degressEnable": 0,
+      "degression": [0,0,0]
     }
+  }
 }
\ No newline at end of file

--
Gitblit v1.8.0