json位置修改

fengxiang

2017-11-03 269fd088f1c308b7e11d531a4485d163261ea2df

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

@@ -20,6 +20,7 @@
import org.springframework.amqp.rabbit.core.RabbitTemplate;

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

import org.springframework.core.io.ClassPathResource;

import org.springframework.data.mongodb.core.MongoTemplate;

import org.springframework.data.redis.core.RedisTemplate;

import org.springframework.util.StringUtils;



@@ -45,6 +46,9 @@


    @Resource

    RedisTemplate<String, String> redisTemplate;



    @Resource

    protected MongoTemplate mongoTemplate;



    private Logger logger = LoggerFactory.getLogger(TaskListener.class);



@@ -101,24 +105,25 @@


//        //保存原始数据

//        taskDao.insertTologger(mac, message, getDate());

//

//        //保存历史记录

//        List<History> histories = new ArrayList<History>();

//        List<Sensor> sensorList = taskDao.selectFromsensorByver(ver);

//        for (Sensor sensor : sensorList) {

//            String key = sensor.getMac_key();

//            if(msgData.containsKey(key)) {

//                //taskDao.insertTohistory(mac, sensor.getSensor(), key, msgData.get(key));

//                History history = new History();

//                history.setMac(mac);

//                history.setMac_key(key);

//                history.setTime(new Date(Long.parseLong(msgData.get("time"))));

//                history.setSensor(sensor.getSensor());

//                history.setMac_value(Double.valueOf(msgData.get(key)));

//                histories.add(history);

//            }

//        }

//        jobDao.batchInsertHistory(histories);

        mongoTemplate.insert(message, "logger");



        //保存历史记录

        List<History> histories = new ArrayList<History>();

        List<Sensor> sensorList = taskDao.selectFromsensorByver(ver);

        for (Sensor sensor : sensorList) {

            String key = sensor.getMac_key();

            if(msgData.containsKey(key)) {

                //taskDao.insertTohistory(mac, sensor.getSensor(), key, msgData.get(key));

                History history = new History();

                history.setMac(mac);

                history.setMac_key(key);

                history.setTime(new Date(Long.parseLong(msgData.get("time"))));

                history.setSensor(sensor.getSensor());

                history.setMac_value(Double.valueOf(msgData.get(key)));

                histories.add(history);

            }

        }

        jobDao.batchInsertHistory(histories);

    }



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

@@ -141,7 +146,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());

@@ -154,9 +159,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(level1!=0&&level2!=0&&level3!=0) {

            //三级警报数组

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

            alarmLevles.put(key, arr);

         }

      }

    }

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