Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

 src/main/resources/system/alarmLevels.json

@@ -1,181 +1,273 @@
{
    "alarmMode": {
        "enable": 1,
        "level1": [],
        "level2": [],
        "level3": []
  "alarmMode": {
    "enable": 0,
    "interval":1440,
    "level1": [],
    "level2": [],
    "level3": []
  },
  "alarmLevels": {
    "e1": {
      "enable": 1,
      "increment": [
        35,
        75,
        115,
        150,
        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,
        150,
        250,
        350,
        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": 1,
      "increment": [
        5,
        6,
        7.5
      ],
      "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,
        60
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e8": {
      "enable": 0,
      "increment": [
        30,
        40,
        50
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e9": {
      "enable": 1,
      "increment": [
        3000,
        3600,
        4500
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e10": {
      "enable": 1,
      "increment": [
        5,
        10,
        35,
        60,
        90
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e11": {
      "enable": 1,
      "increment": [
        150,
        500,
        650,
        800,
        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": 1,
      "increment": [
        10000,
        12000,
        15000
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e15": {
      "enable": 1,
      "increment": [
        160,
        200,
        300,
        400,
        800
      ],
      "degressEnable": 0,
      "degression": [0,0,0]
    },
    "e16": {
      "enable": 1,
      "increment": [
        100,
        200,
        700,
        1200,
        2340
      ],
      "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]
    },
    "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]
    }
  }
}