From ac5c0ea75ed3606ff675c70c4456241495c2c8a9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 17 Apr 2018 13:20:26 +0800
Subject: [PATCH] 组织报警间隔时间

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

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

--
Gitblit v1.8.0