From e0c4b15be905f30d6e83025d5a4aca5c7db55a7f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 08 Apr 2020 15:34:20 +0800
Subject: [PATCH] 删除无人机经纬度为0的数据
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 140 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 108 insertions(+), 32 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..07a9aaa 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -1,11 +1,10 @@
package com.moral.service.impl;
-import static com.moral.common.bean.Constants.NULL_VALUE;
-import static org.springframework.util.ObjectUtils.isEmpty;
-
import java.math.BigDecimal;
import java.text.ParseException;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
import java.util.Arrays;
@@ -28,8 +27,7 @@
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
-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,9 +45,15 @@
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;
+
+import javax.annotation.Resource;
+
+import static com.moral.common.bean.Constants.NULL_VALUE;
+import static org.springframework.util.ObjectUtils.isEmpty;
@Service
@SuppressWarnings({"unchecked", "unused", "rawtypes"})
@@ -57,6 +61,9 @@
@Resource
private HistoryMinutelyMapper historyMinutelyMapper;
+
+ @Resource
+ private HistoryMapper historyMapper;
@Resource
private DeviceMapper deviceMapper;
@@ -70,37 +77,51 @@
@Override
public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
//ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
- LocalDate localDate = LocalDate.now();
+ LocalDate time = LocalDate.now();
+ int year = time.getYear();
+ int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ if (day == 1) {
+ if (month == 1) {
+ month = 12;
+ year = year - 1;
+ } else {
+ month = month - 1;
+ }
+ }
+ String monthStr = month < 10 ? ("0" + month) : month + "";
+ String yearAndMonth = year + monthStr;
// ������00:00:00
- parameters.put("start", localDate.minusDays(1));
+ parameters.put("start", time.minusDays(1));
+
+ // ������00:00:00
+ parameters.put("end", time);
+ parameters.put("yearAndMonth", yearAndMonth);
+ 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);
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);
- 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) {
@@ -530,8 +551,63 @@
* @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();
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime startTimeLocalDateTime = LocalDateTime.parse(startTime, dateTimeFormatter);
+ LocalDate time = LocalDate.now();
+ int year = startTimeLocalDateTime.getYear();
+ int month = startTimeLocalDateTime.getMonthValue();
+ String monthStr = month < 10 ? ("0" + month) : month + "";
+ String yearAndMonth = year + monthStr;
+ 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 (year <= 2019) {
+ listMap = historyMinutelyMapper.getSensorData(parameters);
+ } else {
+ parameters.put("yearAndMonth", yearAndMonth);
+ listMap = historyMinutelyMapper.getSensorData2020(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 (Entry<String, Object> entry : map.entrySet()) {
+ for (Sensor sensor : sensors) {
+ if (sensor.getSensorKey().equals(entry.getKey())) {
+ mapAvg.put(entry.getKey(), new BigDecimal(entry.getValue().toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ } else if (("min" + sensor.getSensorKey()).equals(entry.getKey())) {
+ mapMin.put(entry.getKey().substring(3), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString());
+ } else if (("max" + sensor.getSensorKey()).equals(entry.getKey())) {
+ mapMax.put(entry.getKey().substring(3), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString());
+ }
+ }
+ }
+ if(mapAvg.get("e76").equals("0��")||mapMin.get("e76").equals("0")||mapMax.get("e76").equals("0")||mapAvg.get("e77").equals("0��")||mapMin.get("e77").equals("0")||mapMax.get("e77").equals("0")){
+ continue;
+ }
+ listMapAvg.add(mapAvg);
+ listMapMin.add(mapMin);
+ listMapMax.add(mapMax);
+ }
+ listMaps.add(listMapAvg);
+ listMaps.add(listMapMin);
+ listMaps.add(listMapMax);
+ }
+ return listMaps;
}
+
}
--
Gitblit v1.8.0