Merge remote-tracking branch 'origin/master'

沈斌

2017-11-02 43d81456014338d53aefc3ec81a9eafa38bf8a3f

Merge remote-tracking branch 'origin/master'

 src/main/java/com/moral/monitor/listener/TaskListener.java

@@ -159,11 +159,14 @@
            double level1 = levels.get("level1");

            double level2 = levels.get("level2");

            double level3 = levels.get("level3");

            //当三个值都为零时，不加入阀值

            if(level1!=0&&level2!=0&&level3!=0) {

            //三级警报数组

            Double arr[] = {0.0,level1,level2,level3};

            alarmLevles.put(key, arr);

        }

    }

    }

    //根据三级警报阀值，确定设备状态

    private int detEquState(Map<String,String> data) {

        int state = 0;


 src/main/resources/alarmLevles.json

@@ -1,97 +1,97 @@
{

    "e1":{

        "level1":20,

        "level2":60,

        "level3":100

        "level1":35,

        "level2":115,

        "level3":250

    },

    "e2":{

        "level1":30,

        "level2":60,

        "level3":90

        "level1":50,

        "level2":250,

        "level3":420

    },

    "e3":{

        "level1":2000,

        "level2":5000,

        "level3":8000

        "level1":0,

        "level2":0,

        "level3":0

    },

    "e4":{

        "level1":10,

        "level2":30,

        "level3":60

        "level1":0,

        "level2":0,

        "level3":0

    },

    "e5":{

        "level1":0.01,

        "level2":0.02,

        "level3":0.05

        "level1":0,

        "level2":0,

        "level3":0

    },

    "e6":{

        "level1":60,

        "level2":100,

        "level3":160

        "level1":0,

        "level2":0,

        "level3":0

    },

    "e7":{

        "level1":35,

        "level2":30,

        "level3":40

        "level1":0,

        "level2":0,

        "level3":0

    },

    "e8":{

        "level1":20,

        "level2":25,

        "level3":30

        "level1":0,

        "level2":0,

        "level3":0

    },

    "e9":{

        "level1":0.01,

        "level2":0.02,

        "level3":0.03

        "level1":0,

        "level2":0,

        "level3":0

    },

    "e10":{

        "level1":0.2,

        "level2":0.5,

        "level3":0.8

        "level1":2,

        "level2":14,

        "level3":36

    },

    "e11":{

        "level1":0.02,

        "level2":0.03,

        "level3":0.05

        "level1":0.05,

        "level2":0.475,

        "level3":1.6

    },

    "e12":{

        "level1":10000,

        "level2":15000,

        "level3":25000

        "level1":0,

        "level2":0,

        "level3":0

    },

    "e13":{

        "level1":20,

        "level2":65,

        "level1":30,

        "level2":50,

        "level3":90

    },

    "e14":{

        "level1":2,

        "level2":4,

        "level3":6

        "level1":0,

        "level2":0,

        "level3":0

    },

    "e15":{

        "level1":0.5,

        "level2":1,

        "level3":3

        "level1":0.16,

        "level2":0.3,

        "level3":0.8

    },

    "e16":{

        "level1":0.15,

        "level2":0.3,

        "level3":0.6

        "level1":0.04,

        "level2":0.18,

        "level3":0.565

    },

    "e17":{

        "level1":1,

        "level2":2,

        "level3":5

        "level1":0,

        "level2":0,

        "level3":0

    },

    "e18":{

        "level1":5,

        "level2":6,

        "level3":8

        "level1":0,

        "level2":0,

        "level3":0

    },

    "e19":{

        "level1":480,

        "level2":580,

        "level3":680

        "level1":0,

        "level2":0,

        "level3":0

    }

}