test

沈斌

2018-02-26 a4f11cd94cb83dc59f4b9fe1871ec1f9a1b19b46

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

@@ -68,13 +68,18 @@
                logger.warn(e.getMessage());

            }



            Map<String, String> msgData = JSON.parseObject(message, new TypeReference<Map<String, String>>() {});

            String mac = msgData.get("mac");

            String ver = msgData.get("ver");



            if(StringUtils.isEmpty(ver) || StringUtils.isEmpty(mac)) {

            Map<String, Object> msgData = JSON.parseObject(message, new TypeReference<Map<String, Object>>() {});

            Object macObj = msgData.get("mac");

            Object timeObj = msgData.get("time");

            Object verObj = msgData.get("ver");

            if(StringUtils.isEmpty(verObj) || StringUtils.isEmpty(timeObj) || StringUtils.isEmpty(macObj)) {

                logger.warn("some properties is null, param[0] message:"+JSON.toJSONString(message));

                return;

            }



            String mac = macObj.toString();

            String ver = verObj.toString();



            //获取缓存中的校准值map 

            Map<String, Float> adjustMap = redisService.getAdjustsByMac(mac);

            if(adjustMap!=null&&!adjustMap.isEmpty()) {

@@ -82,8 +87,8 @@
                    String key = entry.getKey();

                    if(msgData.containsKey(key)) {

                        Float value = entry.getValue();

                        Float dataValue = Float.valueOf(msgData.get(key)) ;

                        msgData.put(key, String.valueOf(dataValue + value));

                        Float dataValue = Float.valueOf(msgData.get(key).toString()) ;

                        msgData.put(key, dataValue + value);

                    }

                }

            }

@@ -105,29 +110,33 @@
//            taskDao.insertTologger(mac, message, getDate());

            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);



//暂停保存历史记录

//            //保存历史记录

//            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").toString())));

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

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

//                    histories.add(history);

//                }

//            }

//            jobDao.batchInsertHistory(histories);





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

            mongoTemplate.insert(new_message, "data");

      } catch (Exception e) {

          //打印错误

           logger.error(e.getMessage());

         //打印错误

            logger.error(e.getMessage());

            e.printStackTrace();

      }

    }

//    //三级警报值阀值

@@ -189,18 +198,17 @@
    }



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

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

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



        Map<String,Double[]> alarmLevles = getAlarmLevels();



       int state = 0;

       Map<String, Object> equMap = new HashMap<String, Object>();

       String mac = data.get("mac");

       data.remove("mac");//不需要存储mac地址

       String mac = data.get("mac").toString();

       equMap.putAll(data);

       if(data!=null) {

             for(String key:alarmLevles.keySet()) {

                  String value = data.get(key);

                  String value = data.get(key).toString();

                  if(!StringUtils.isEmpty(value)) {

                     double val = Double.parseDouble(value);

                     //获取三级警报阀值