Merge remote-tracking branch 'origin/master'

沈斌

2017-11-07 ba9a621c55f520be8e26cdb0d3ad61b5246b2fc1

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

@@ -17,6 +17,7 @@
import org.slf4j.LoggerFactory;

import org.springframework.amqp.core.Message;

import org.springframework.amqp.core.MessageListener;

import org.springframework.amqp.core.MessageProperties;

import org.springframework.amqp.rabbit.core.RabbitTemplate;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.core.io.ClassPathResource;

@@ -93,8 +94,9 @@
//        System.out.println(message);

//        System.out.println(JSON.toJSONString(msgData));



        rabbitTemplate.convertAndSend("monitors_data2", "", JSON.toJSONString(msgData).getBytes());

//        rabbitTemplate.send("monitors_data_3", "", new Message(JSON.toJSONString(msgData).getBytes(), new MessageProperties()));

        String new_message = JSON.toJSONString(msgData);

        rabbitTemplate.convertAndSend("monitors_data2", "", new_message.getBytes());

//        rabbitTemplate.send("monitors_data2", "", new Message(JSON.toJSONString(msgData).getBytes(), new MessageProperties()));



//        int state = (new Random()).nextInt(4) % 5; //TODO

          int state = detEquState(msgData);

@@ -124,6 +126,9 @@
            }

        }

        jobDao.batchInsertHistory(histories);



        //mongoTemplate.insert(JSON.toJSONString(histories), "data");

        mongoTemplate.insert(new_message, "data");

    }



    private Map<String, Float> getAdjustData(String mac) {

@@ -146,7 +151,7 @@
    /*

     * 设置三级警报阀值,把map数据结构转换成数组结构

     */

   @Value(value="alarmLevles.json")

   @Value(value= "system/alarmLevels.json")

    public void setAlarmLevles(String path) throws IOException {

       org.springframework.core.io.Resource resource  = new ClassPathResource(path);

       InputStreamReader reader=new InputStreamReader(resource.getInputStream());

@@ -159,9 +164,12 @@
         double level1 = levels.get("level1");

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

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

         //三级警报数组

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

         alarmLevles.put(key, arr);

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

         if(levels.get("enable")!=null&&levels.get("enable")==1) {

            //三级警报数组

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

            alarmLevles.put(key, arr);

         }

      }

    }

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