Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

 src/main/resources/system/alarmLevels.json

@@ -1,116 +1,273 @@
{
    "e1":{
        "level1":35,
        "level2":115,
        "level3":250,
        "enable":1
  "alarmMode": {
    "enable": 0,
    "interval":1440,
    "level1": [],
    "level2": [],
    "level3": []
  },
  "alarmLevels": {
    "e1": {
      "enable": 1,
      "increment": [
        35,
        75,
        115,
        150,
        250
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e2":{
        "level1":50,
        "level2":250,
        "level3":420,
        "enable":1
    "e2": {
      "enable": 1,
      "increment": [
        50,
        150,
        250,
        350,
        420
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e3":{
        "level1":20000,
        "level2":30000,
        "level3":40000,
        "enable":0
    "e3": {
      "enable": 0,
      "increment": [
        20000,
        30000,
        40000
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e4":{
        "level1":30,
        "level2":75,
        "level3":100,
        "enable":0
    "e4": {
      "enable": 0,
      "increment": [
        30,
        75,
        100
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e5":{
        "level1":0.01,
        "level2":0.02,
        "level3":0.05,
        "enable":0
    "e5": {
      "enable": 1,
      "increment": [
        5,
        6,
        7.5
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e6":{
        "level1":60,
        "level2":100,
        "level3":160,
        "enable":0
    "e6": {
      "enable": 0,
      "increment": [
        60,
        100,
        160
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e7":{
        "level1":35,
        "level2":30,
        "level3":40,
        "enable":0
    "e7": {
      "enable": 0,
      "increment": [
        25,
        30,
        60
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e8":{
        "level1":30,
        "level2":40,
        "level3":50,
        "enable":0
    "e8": {
      "enable": 0,
      "increment": [
        30,
        40,
        50
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e9":{
        "level1":0.01,
        "level2":0.02,
        "level3":0.03,
        "enable":0
    "e9": {
      "enable": 1,
      "increment": [
        3000,
        3600,
        4500
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e10":{
        "level1":2,
        "level2":14,
        "level3":36,
        "enable":1
    "e10": {
      "enable": 1,
      "increment": [
        5,
        10,
        35,
        60,
        90
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e11":{
        "level1":50,
        "level2":475,
        "level3":1600,
        "enable":1
    "e11": {
      "enable": 1,
      "increment": [
        150,
        500,
        650,
        800,
        1600
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e12":{
        "level1":10000,
        "level2":15000,
        "level3":20000,
        "enable":0
    "e12": {
      "enable": 0,
      "increment": [
        10000,
        15000,
        20000
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e13":{
        "level1":60,
        "level2":90,
        "level3":120,
        "enable":0
    "e13": {
      "enable": 0,
      "increment": [
        60,
        90,
        120
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e14":{
        "level1":100,
        "level2":200,
        "level3":300,
        "enable":0
    "e14": {
      "enable": 1,
      "increment": [
        10000,
        12000,
        15000
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e15":{
        "level1":160,
        "level2":300,
        "level3":800,
        "enable":1
    "e15": {
      "enable": 1,
      "increment": [
        160,
        200,
        300,
        400,
        800
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e16":{
        "level1":40,
        "level2":180,
        "level3":565,
        "enable":1
    "e16": {
      "enable": 1,
      "increment": [
        100,
        200,
        700,
        1200,
        2340
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e17":{
        "level1":1.5,
        "level2":3,
        "level3":5,
        "enable":0
    "e17": {
      "enable": 0,
      "increment": [
        1.5,
        3,
        5
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e18":{
        "level1":5,
        "level2":6,
        "level3":8,
        "enable":0
    "e18": {
      "enable": 0,
      "increment": [
        5,
        6,
        8
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e19":{
        "level1":3000,
        "level2":4000,
        "level3":5000,
        "enable":0
    "e19": {
      "enable": 0,
      "increment": [
        3000,
        4000,
        5000
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e21": {
      "enable": 1,
      "increment": [
        3,
        4,
        5
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e25": {
      "enable": 1,
      "increment": [
        41,
        49,
        62
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e26": {
      "enable": 1,
      "increment": [
        47,
        57,
        71
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e27": {
      "enable": 1,
      "increment": [
        71,
        86,
        107
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e29": {
      "enable": 1,
      "increment": [
        71,
        86,
        107
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e30": {
      "enable": 1,
      "increment": [
        84,
        101,
        126
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    }
  }
}