From 83975f056b98871b1206be3bd741a7de68716d58 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 20 Aug 2019 15:03:18 +0800
Subject: [PATCH] map传值改为英文
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 111 +++++++++++--------------------------------------------
1 files changed, 23 insertions(+), 88 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 581029a..ce67df4 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -536,7 +536,7 @@
* @return
*/
@Override
- public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) {
+ public List<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) {
String startTime = parameters.get("startTime").toString();
Boolean flag = null;
try {
@@ -556,103 +556,38 @@
} else {
listMap = historyMinutelyMapper.getSensorData(parameters);
}
- List<Map<String, Object>> listMapNew = new ArrayList<>();
- Map<String, Object> new_map = new LinkedHashMap<>();
+ List<List<Map<String, Object>>> listMaps = new ArrayList<>();
+ List<Map<String, Object>> listMapAvg = new ArrayList<>();
+ List<Map<String, Object>> listMapMin = new ArrayList<>();
+ List<Map<String, Object>> listMapMax = new ArrayList<>();
if (CollectionUtils.isNotEmpty(listMap)) {
for (Map<String, Object> map : listMap) {
- new_map.put("������", map.get("time"));
+ Map<String, Object> mapAvg = new LinkedHashMap<>();
+ Map<String, Object> mapMin = new LinkedHashMap<>();
+ Map<String, Object> mapMax = new LinkedHashMap<>();
+ mapAvg.put("time", map.get("time"));
+ mapMin.put("time", map.get("time"));
+ mapMax.put("time", map.get("time"));
for (String key : map.keySet()) {
for (Sensor sensor : sensors) {
if (sensor.getSensorKey().equals(key)) {
- new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ mapAvg.put(key, new BigDecimal(map.get(key).toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ } else if (("min" + sensor.getSensorKey()).equals(key)) {
+ mapMin.put(key.substring(3), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());
+ } else if (("max" + sensor.getSensorKey()).equals(key)) {
+ mapMax.put(key.substring(3), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());
}
}
}
- listMapNew.add(new_map);
- new_map = new LinkedHashMap<>();
+ listMapAvg.add(mapAvg);
+ listMapMin.add(mapMin);
+ listMapMax.add(mapMax);
}
+ listMaps.add(listMapAvg);
+ listMaps.add(listMapMin);
+ listMaps.add(listMapMax);
}
- return listMapNew;
- }
-
- @Override
- public List<Map<String, Object>> getSensorDataMin(Map<String, Object> parameters) {
- String startTime = parameters.get("startTime").toString();
- Boolean flag = null;
- try {
- flag = DateUtils.isSameDay(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime), new Date());
- } catch (ParseException e) {
- e.printStackTrace();
- }
- 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 = null;
- if (flag) {
- listMap = historyMapper.getSensorDataToday(parameters);
- } else {
- 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("time"));
- for (String key : map.keySet()) {
- for (Sensor sensor : sensors) {
- if (("min" + sensor.getSensorKey()).equals(key)) {
- new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());
- }
- }
- }
- listMapNew.add(new_map);
- new_map = new LinkedHashMap<>();
- }
- }
- return listMapNew;
- }
-
- @Override
- public List<Map<String, Object>> getSensorDataMax(Map<String, Object> parameters) {
- String startTime = parameters.get("startTime").toString();
- Boolean flag = null;
- try {
- flag = DateUtils.isSameDay(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime), new Date());
- } catch (ParseException e) {
- e.printStackTrace();
- }
- 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 = null;
- if (flag) {
- listMap = historyMapper.getSensorDataToday(parameters);
- } else {
- 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("time"));
- for (String key : map.keySet()) {
- for (Sensor sensor : sensors) {
- if (("max" + sensor.getSensorKey()).equals(key)) {
- new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());
- }
- }
- }
- listMapNew.add(new_map);
- new_map = new LinkedHashMap<>();
- }
- }
- return listMapNew;
+ return listMaps;
}
}
--
Gitblit v1.8.0