From 957edae85001e7125b0617562aeca9afaef89f17 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 06 Aug 2019 13:57:48 +0800
Subject: [PATCH] 修改根据mac动态获得查询因子
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 42c091c..d58fe5c 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -536,14 +536,18 @@
*/
@Override
public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) {
- parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e3", "e4", "e6", "e7", "e9", "e10", "e11", "e15", "e16", "e17", "e27", "e28", "e76", "e77", "e78", "e79", "e80", "e81"));
- List<Sensor> sensors = sensorMapper.selectByExample(null);
- System.out.println(sensors);
+ List<Sensor> sensors=sensorMapper.getSensorsByMac(parameters);
+ List<String> sensorKeys=new ArrayList<>();
+ for(Sensor sensor:sensors){
+ sensorKeys.add(sensor.getSensorKey());
+ }
+ parameters.put("sensorKeys", sensorKeys);
List<Map<String, Object>> listMap = historyMinutelyMapper.getSensorData(parameters);
List<Map<String, Object>> listMapNew = new ArrayList<>();
Map<String, Object> new_map = new LinkedHashMap<>();
if (CollectionUtils.isNotEmpty(listMap)) {
for (Map<String, Object> map : listMap) {
+ new_map.put("������", map.get("uavDate"));
for (String key : map.keySet()) {
for (Sensor sensor : sensors) {
if (sensor.getSensorKey().equals(key)) {
@@ -555,7 +559,6 @@
}
}
}
- new_map.put("������", map.get("uavDate"));
listMapNew.add(new_map);
new_map = new LinkedHashMap<>();
}
--
Gitblit v1.8.0