From e34d88ad7d3d950da12f032e6932ba14f868db72 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 21 Aug 2019 10:22:50 +0800
Subject: [PATCH] 修改大屏无人机地图弹窗显示不全问题，设置可拖动
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index abddd48..ce67df4 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -5,6 +5,7 @@
import java.math.BigDecimal;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
@@ -30,6 +31,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;
@@ -47,6 +49,7 @@
import com.moral.entity.charts.TimePeriod;
import com.moral.mapper.AlarmDailyMapper;
import com.moral.mapper.DeviceMapper;
+import com.moral.mapper.HistoryMapper;
import com.moral.mapper.HistoryMinutelyMapper;
import com.moral.mapper.SensorMapper;
import com.moral.service.HistoryMinutelyService;
@@ -57,6 +60,9 @@
@Resource
private HistoryMinutelyMapper historyMinutelyMapper;
+
+ @Resource
+ private HistoryMapper historyMapper;
@Resource
private DeviceMapper deviceMapper;
@@ -73,6 +79,28 @@
LocalDate localDate = LocalDate.now();
// ������00:00:00
parameters.put("start", localDate.minusDays(1));
+
+ // ������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);
+ }
+
+ @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);
@@ -508,8 +536,58 @@
* @return
*/
@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);
+ public List<List<Map<String, Object>>> getSensorData(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<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) {
+ 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)) {
+ 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());
+ }
+ }
+ }
+ listMapAvg.add(mapAvg);
+ listMapMin.add(mapMin);
+ listMapMax.add(mapMax);
+ }
+ listMaps.add(listMapAvg);
+ listMaps.add(listMapMin);
+ listMaps.add(listMapMax);
+ }
+ return listMaps;
}
+
}
--
Gitblit v1.8.0