From 03cdc1111aa07041d635840eb30433cbb980accf Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Wed, 28 Feb 2018 16:44:48 +0800 Subject: [PATCH] test --- src/main/java/com/moral/monitor/listener/TaskListener.java | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java index f26b0e7..11612fb 100644 --- a/src/main/java/com/moral/monitor/listener/TaskListener.java +++ b/src/main/java/com/moral/monitor/listener/TaskListener.java @@ -68,10 +68,14 @@ 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"); - + Map<String, Object> msgData = JSON.parseObject(message, new TypeReference<Map<String, Object>>() {}); + 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; } @@ -82,8 +86,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,6 +109,7 @@ // taskDao.insertTologger(mac, message, getDate()); mongoTemplate.insert(message, "logger"); + //������������������ List<History> histories = new ArrayList<History>(); List<Sensor> sensorList = taskDao.selectFromsensorByver(ver); @@ -115,19 +120,21 @@ History history = new History(); history.setMac(mac); history.setMac_key(key); - history.setTime(new Date(Long.parseLong(msgData.get("time")))); + history.setTime(new Date(Long.parseLong(msgData.get("time").toString()))); history.setSensor(sensor.getSensor()); - history.setMac_value(Double.valueOf(msgData.get(key))); + 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,17 +196,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"); + 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); //������������������������ -- Gitblit v1.8.0