From 24b5764532e012274759d71ed02844ad2eb901e4 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 30 Jan 2018 16:37:36 +0800
Subject: [PATCH] api接口调整

---
 src/main/resources/system/alarmLevels.json |  289 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 177 insertions(+), 112 deletions(-)

diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 88e94de..74a507c 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -1,116 +1,181 @@
 {
-    "e1":{
-        "level1":35,
-        "level2":115,
-        "level3":250,
-        "enable":1
+    "alarmMode": {
+        "enable": 1,
+        "level1": [],
+        "level2": [],
+        "level3": []
     },
-    "e2":{
-        "level1":50,
-        "level2":250,
-        "level3":420,
-        "enable":1
-    },
-    "e3":{
-        "level1":20000,
-        "level2":30000,
-        "level3":40000,
-        "enable":0
-    },
-    "e4":{
-        "level1":30,
-        "level2":75,
-        "level3":100,
-        "enable":0
-    },
-    "e5":{
-        "level1":0.01,
-        "level2":0.02,
-        "level3":0.05,
-        "enable":0
-    },
-    "e6":{
-        "level1":60,
-        "level2":100,
-        "level3":160,
-        "enable":0
-    },
-    "e7":{
-        "level1":35,
-        "level2":30,
-        "level3":40,
-        "enable":0
-    },
-    "e8":{
-        "level1":30,
-        "level2":40,
-        "level3":50,
-        "enable":0
-    },
-    "e9":{
-        "level1":0.01,
-        "level2":0.02,
-        "level3":0.03,
-        "enable":0
-    },
-    "e10":{
-        "level1":2,
-        "level2":14,
-        "level3":36,
-        "enable":1
-    },
-    "e11":{
-        "level1":50,
-        "level2":475,
-        "level3":1600,
-        "enable":1
-    },
-    "e12":{
-        "level1":10000,
-        "level2":15000,
-        "level3":20000,
-        "enable":0
-    },
-    "e13":{
-        "level1":60,
-        "level2":90,
-        "level3":120,
-        "enable":0
-    },
-    "e14":{
-        "level1":100,
-        "level2":200,
-        "level3":300,
-        "enable":0
-    },
-    "e15":{
-        "level1":160,
-        "level2":300,
-        "level3":800,
-        "enable":1
-    },
-    "e16":{
-        "level1":40,
-        "level2":180,
-        "level3":565,
-        "enable":1
-    },
-    "e17":{
-        "level1":1.5,
-        "level2":3,
-        "level3":5,
-        "enable":0
-    },
-    "e18":{
-        "level1":5,
-        "level2":6,
-        "level3":8,
-        "enable":0
-    },
-    "e19":{
-        "level1":3000,
-        "level2":4000,
-        "level3":5000,
-        "enable":0
+    "alarmLevels": {
+        "e1": {
+            "enable": 1,
+            "increment": [
+                35,
+                115,
+                250
+            ],
+            "degression": null
+        },
+        "e2": {
+            "enable": 1,
+            "increment": [
+                50,
+                250,
+                420
+            ],
+            "degression": null
+        },
+        "e3": {
+            "enable": 0,
+            "increment": [
+                20000,
+                30000,
+                40000
+            ],
+            "degression": null
+        },
+        "e4": {
+            "enable": 0,
+            "increment": [
+                30,
+                75,
+                100
+            ],
+            "degression": null
+        },
+        "e5": {
+            "enable": 0,
+            "increment": [
+                0.01,
+                0.02,
+                0.05
+            ],
+            "degression": null
+        },
+        "e6": {
+            "enable": 0,
+            "increment": [
+                60,
+                100,
+                160
+            ],
+            "degression": null
+        },
+        "e7": {
+            "enable": 0,
+            "increment": [
+                25,
+                30,
+                40
+            ],
+            "degression": null
+        },
+        "e8": {
+            "enable": 0,
+            "increment": [
+                30,
+                40,
+                50
+            ],
+            "degression": null
+        },
+        "e9": {
+            "enable": 0,
+            "increment": [
+                0.01,
+                0.02,
+                0.03
+            ],
+            "degression": null
+        },
+        "e10": {
+            "enable": 1,
+            "increment": [
+                2,
+                14,
+                36
+            ],
+            "degression": null
+        },
+        "e11": {
+            "enable": 1,
+            "increment": [
+                50,
+                475,
+                1600
+            ],
+            "degression": null
+        },
+        "e12": {
+            "enable": 0,
+            "increment": [
+                10000,
+                15000,
+                20000
+            ],
+            "degression": null
+        },
+        "e13": {
+            "enable": 0,
+            "increment": [
+                60,
+                90,
+                120
+            ],
+            "degression": null
+        },
+        "e14": {
+            "enable": 0,
+            "increment": [
+                100,
+                200,
+                300
+            ],
+            "degression": null
+        },
+        "e15": {
+            "enable": 1,
+            "increment": [
+                160,
+                300,
+                800
+            ],
+            "degression": null
+        },
+        "e16": {
+            "enable": 1,
+            "increment": [
+                40,
+                180,
+                565
+            ],
+            "degression": null
+        },
+        "e17": {
+            "enable": 0,
+            "increment": [
+                1.5,
+                3,
+                5
+            ],
+            "degression": null
+        },
+        "e18": {
+            "enable": 0,
+            "increment": [
+                5,
+                6,
+                8
+            ],
+            "degression": null
+        },
+        "e19": {
+            "enable": 0,
+            "increment": [
+                3000,
+                4000,
+                5000
+            ],
+            "degression": null
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0