test

沈斌

2018-02-28 875ade2caa81f3c42554d554ebe1f649c21a3447

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

@@ -69,9 +69,13 @@
            }



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

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

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



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

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

            if(obj_ver == null || obj_mac == null) {

                return;

            }

            String mac = obj_mac.toString();

            String ver = obj_ver.toString();

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

                return;

            }

@@ -106,24 +110,23 @@
            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").toString())));

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

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

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