From 8110506221e3c34a62202e34b7dd28227c13c714 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 15 Apr 2020 15:43:29 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 20f9137..e9edf52 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -49,6 +49,7 @@
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;
@@ -76,12 +77,26 @@
@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", localDate);
+ 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);
@@ -540,9 +555,10 @@
String startTime = parameters.get("startTime").toString();
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime startTimeLocalDateTime = LocalDateTime.parse(startTime, dateTimeFormatter);
- LocalDate today = LocalDate.now();
- LocalDate startTimeLocalDate=startTimeLocalDateTime.toLocalDate();
- Boolean flag=today.isEqual(startTimeLocalDate);
+ 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) {
@@ -550,10 +566,11 @@
}
parameters.put("sensorKeys", sensorKeys);
List<Map<String, Object>> listMap = null;
- if (flag) {
- listMap = historyMapper.getSensorDataToday(parameters);
- } else {
+ 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<>();
@@ -567,7 +584,7 @@
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 (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());
@@ -578,6 +595,9 @@
}
}
}
+ if("0��".equals(mapAvg.get("e76")) || "0".equals(mapMin.get("e76")) || "0".equals(mapMax.get("e76")) || "0��".equals(mapAvg.get("e77")) || "0".equals(mapMin.get("e77")) || "0".equals(mapMax.get("e77"))){
+ continue;
+ }
listMapAvg.add(mapAvg);
listMapMin.add(mapMin);
listMapMax.add(mapMax);
@@ -589,4 +609,27 @@
return listMaps;
}
+ @Override
+ public List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters) throws Exception {
+ if ("month".equals(parameters.get("type"))) {
+ parameters.put("timeUnits", "daily");
+ parameters.put("typeFormat", "%Y-%m-%d");
+ String time = parameters.get("time")+"-01T00:00:00";
+ LocalDateTime value = LocalDateTime.parse(time);
+ LocalDateTime start = value.with(TemporalAdjusters.firstDayOfMonth());
+ LocalDateTime end = value.with(TemporalAdjusters.lastDayOfMonth());
+ parameters.put("start", start);
+ parameters.put("end", end);
+ }else if("day".equals(parameters.get("type"))){
+ String time = parameters.get("time")+"T00:00:00";
+ LocalDateTime value = LocalDateTime.parse(time);
+ LocalDateTime end=value.plusHours(23);
+ parameters.put("timeUnits", "hourly");
+ parameters.put("typeFormat", "%Y-%m-%d %H");
+ parameters.put("start", time);
+ parameters.put("end", end);
+ }
+ return historyMinutelyMapper.getDevicesAvgDataToExcel(parameters);
+ }
+
}
--
Gitblit v1.8.0