From 39f896b4b357d055ed755de6ab2fefd17df38423 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 02 Aug 2019 17:25:18 +0800
Subject: [PATCH] 查询因子map的key修改为中文
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 2bcc133..e2e94d3 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -30,6 +30,7 @@
import javax.annotation.Resource;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -50,6 +51,9 @@
import com.moral.mapper.HistoryMinutelyMapper;
import com.moral.mapper.SensorMapper;
import com.moral.service.HistoryMinutelyService;
+import com.moral.service.SensorService;
+
+import lombok.val;
@Service
@SuppressWarnings({"unchecked", "unused", "rawtypes"})
@@ -80,27 +84,27 @@
Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
return getAQIByDataMap(average);
}
-
+
@Override
public Map<String, Object> getHourAQIByDevice(Map<String, Object> parameters) {
- //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
- LocalDate localDate = LocalDate.now();
- System.out.println("localDate:"+localDate);
- // ������00:00:00
- //parameters.put("start", localDate.minusDays(1));
-
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
- calendar.set(Calendar.HOUR,calendar.get(Calendar.HOUR) - 1);
- System.out.println("++++++"+calendar);
- int hour = calendar.get(Calendar.HOUR)-1;
- System.out.println("������������������"+hour);
-
- // ������00:00:00
- parameters.put("end", localDate);
- parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));
- Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
- return getAQIByDataMap(average);
+ //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+ LocalDate localDate = LocalDate.now();
+ System.out.println("localDate:" + localDate);
+ // ������00:00:00
+ //parameters.put("start", localDate.minusDays(1));
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ calendar.set(Calendar.HOUR, calendar.get(Calendar.HOUR) - 1);
+ System.out.println("++++++" + calendar);
+ int hour = calendar.get(Calendar.HOUR) - 1;
+ System.out.println("������������������" + hour);
+
+ // ������00:00:00
+ parameters.put("end", localDate);
+ parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));
+ Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
+ return getAQIByDataMap(average);
}
private Map<String, Object> getAQIByDataMap(Map<String, Double> average) {
@@ -531,7 +535,26 @@
*/
@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"));
- return historyMinutelyMapper.getSensorData(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<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) {
+ for (String key : map.keySet()) {
+ for (Sensor sensor : sensors) {
+ if (sensor.getSensorKey().equals(key)) {
+ new_map.put(sensor.getDescription(), map.get(key));
+ }
+ }
+ }
+ new_map.put("������", map.get("uavDate"));
+ listMapNew.add(new_map);
+ new_map = new LinkedHashMap<>();
+ }
+ }
+ return listMapNew;
}
}
--
Gitblit v1.8.0