From ed2a9d376c3846bb8d6cf838bfff9bd3ae07bc3b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 12 Aug 2019 15:52:05 +0800
Subject: [PATCH] 修改多点重合下拉时第一个时间位置不变问题
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 429f0a2..a7fba8d 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -536,9 +536,12 @@
*/
@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<>();
@@ -549,9 +552,9 @@
for (Sensor sensor : sensors) {
if (sensor.getSensorKey().equals(key)) {
if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){
- new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString()));
+ new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString())+sensor.getUnit());
}else{
- new_map.put(sensor.getDescription(), map.get(key));
+ new_map.put(sensor.getDescription(), map.get(key)+sensor.getUnit());
}
}
}
--
Gitblit v1.8.0