From 717e69d5141c264a7333d121e3d8a3311c9b33fb Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 27 Oct 2017 16:11:13 +0800
Subject: [PATCH] 增加 空判断
---
src/main/java/com/moral/monitor/listener/TaskListener.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index 046f0c0..35a1ea3 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.TypeReference;
import com.moral.monitor.dao.JobDao;
import com.moral.monitor.dao.TaskDao;
+import com.moral.monitor.entity.History;
import com.moral.monitor.entity.Sensor;
import com.moral.monitor.util.RedisUtil;
import org.slf4j.Logger;
@@ -87,13 +88,21 @@
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));
+ //taskDao.insertTohistory(mac, sensor.getSensor(), key, msgData.get(key));
+ History history = new History();
+ history.setMac(mac);
+ history.setMac_key(key);
+ 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) {
--
Gitblit v1.8.0