From 33ca0da19b3f87751662de0072c48ce9ce963202 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 31 Jul 2019 15:33:49 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 2 ++
src/main/java/com/moral/controller/ScreenController.java | 7 +++++++
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 22 ++++++++++++++++++++++
3 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 5f1f7eb..54c82d9 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -362,6 +362,13 @@
Map<String, Object> parameters = getParametersStartingWith(request, null);
return historyMinutelyService.getDayAQIByDevice(parameters);
}
+
+ @GetMapping("hour-aqi")
+ @ApiOperation(value = "���������������AQI", notes = "���������������AQI")
+ public Map<String, Object> getHourAQIByDevice(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ return historyMinutelyService.getHourAQIByDevice(parameters);
+ }
/**
* Gets the average by all. ������������������������10������������5������������������������������������������
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 5fd32ee..9e10982 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -10,6 +10,8 @@
public interface HistoryMinutelyService {
Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
+
+ Map<String, Object> getHourAQIByDevice(Map<String, Object> parameters);
Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception;
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index abddd48..2bcc133 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -80,6 +80,28 @@
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) {
Map<String, Object> resultMap = new HashMap<String, Object>();
--
Gitblit v1.8.0