From dcf1385a88fdf517e2cc60b50ea2e0a30e5652ca Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 15:06:26 +0800
Subject: [PATCH] 更改获取五分钟数据结构BUG

---
 src/main/resources/system/alarmLevels.json |   46 +++++++++++++++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 2c4a921..e32bd40 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -11,9 +11,11 @@
       "enable": 1,
       "increment": [
         35,
+        75,
         115,
+        150,
         250
-      ],  
+      ],
       "degressEnable": 0,
       "degression": [0,0,0]
     },
@@ -21,7 +23,9 @@
       "enable": 1,
       "increment": [
         50,
+        150,
         250,
+        350,
         420
       ],
       "degressEnable": 0,
@@ -88,7 +92,7 @@
       "degression": [0,0,0]
     },
     "e9": {
-      "enable": 0,
+      "enable": 1,
       "increment": [
         3000,
         3600,
@@ -100,9 +104,11 @@
     "e10": {
       "enable": 1,
       "increment": [
-        2,
-        14,
-        36
+        5,
+        10,
+        35,
+        60,
+        90
       ],
       "degressEnable": 0,
       "degression": [0,0,0]
@@ -110,8 +116,10 @@
     "e11": {
       "enable": 1,
       "increment": [
-        50,
-        475,
+        150,
+        500,
+        650,
+        800,
         1600
       ],
       "degressEnable": 0,
@@ -138,7 +146,7 @@
       "degression": [0,0,0]
     },
     "e14": {
-      "enable": 0,
+      "enable": 1,
       "increment": [
         10000,
         12000,
@@ -151,7 +159,9 @@
       "enable": 1,
       "increment": [
         160,
+        200,
         300,
+        400,
         800
       ],
       "degressEnable": 0,
@@ -160,9 +170,11 @@
     "e16": {
       "enable": 1,
       "increment": [
-        40,
-        180,
-        565
+        100,
+        200,
+        700,
+        1200,
+        2340
       ],
       "degressEnable": 0,
       "degression": [0,0,0]
@@ -198,7 +210,7 @@
       "degression": [0,0,0]
     },
     "e21": {
-      "enable": 0,
+      "enable": 1,
       "increment": [
         3,
         4,
@@ -208,7 +220,7 @@
       "degression": [0,0,0]
     },
     "e25": {
-      "enable": 0,
+      "enable": 1,
       "increment": [
         41,
         49,
@@ -218,7 +230,7 @@
       "degression": [0,0,0]
     },
     "e26": {
-      "enable": 0,
+      "enable": 1,
       "increment": [
         47,
         57,
@@ -228,7 +240,7 @@
       "degression": [0,0,0]
     },
     "e27": {
-      "enable": 0,
+      "enable": 1,
       "increment": [
         71,
         86,
@@ -238,7 +250,7 @@
       "degression": [0,0,0]
     },
     "e29": {
-      "enable": 0,
+      "enable": 1,
       "increment": [
         71,
         86,
@@ -248,7 +260,7 @@
       "degression": [0,0,0]
     },
     "e30": {
-      "enable": 0,
+      "enable": 1,
       "increment": [
         84,
         101,

--
Gitblit v1.8.0