From 61481f2bd90fe53be3cfc08d86ed1b1b7bc32260 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 15 Nov 2017 14:54:24 +0800
Subject: [PATCH] MongoDB 存储 数值

---
 src/main/java/com/moral/monitor/listener/TaskListener.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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..6c0f81a 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -68,9 +68,9 @@
                 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>>() {});
+            String mac = msgData.get("mac").toString();
+            String ver = msgData.get("ver").toString();
 
             if(StringUtils.isEmpty(ver) || StringUtils.isEmpty(mac)) {
                 return;
@@ -82,8 +82,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);
                     }
                 }
             }
@@ -115,9 +115,9 @@
                     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);
                 }
             }
@@ -189,17 +189,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