From b96cdf306e9124f93e5ca33e006728a2f4552c4d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 04 Sep 2019 14:06:02 +0800
Subject: [PATCH] update

---
 src/main/java/com/moral/service/impl/HistoryServiceImpl.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index dff8765..6a32a37 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -413,7 +413,6 @@
 				break;
 			}
 		}
-		System.out.println(organizationIdList);
 		
 		//������������id������������id
 		List<Map<String, Object>> monitorPointIdListMap = monitorPointMapper.getIdByOrganizationId(organizationIdList);
@@ -438,4 +437,39 @@
 		List<Map<String, Object>> result = historyMapper.getAVGSensorRankByMonitorPointIdList(sensor, monitorPointIdList, before5Time, endTime);
 		return result;
 	}
+
+	@Override
+	public Map<String, Object> gitHourlyAQIByMonitorPointIdAndTimeslot(Map<String, Object> parameters) {
+		String monitor_point_id = parameters.get("monitor_point_id").toString();
+		//������������
+		LocalDate localDate = LocalDate.now();
+    	Calendar c = Calendar.getInstance();//������������������������������������
+    	int endHour = c.get(Calendar.HOUR_OF_DAY);
+    	String endTime = localDate+" "+endHour+":00:00";
+    	
+    	String startTime;
+    	if(endHour == 0) {
+    		LocalDate startDate = localDate.minusDays(1);
+    		startTime = startDate+" "+"23:00:00";
+    	}else {
+			int startHour = endHour-1;
+			startTime = localDate+" "+startHour+":00:00";
+		}
+		Map<String, Object> map = historyMapper.getMonitorPointAVGValueByMonitorPointIdAndTimeslot(monitor_point_id, startTime, endTime);
+		System.out.println(map);
+		Map<String, Object> returnMap = new HashMap<>();
+		if (map.isEmpty()) {
+			returnMap.put("AQI", "N/V");
+		} else {
+			Map<String, Double> AQIMap = new HashMap<>();
+			for (Map.Entry<String, Object> entry : map.entrySet()) {
+				String key = entry.getKey();
+				Double value = Double.parseDouble(entry.getValue().toString());
+				AQIMap.put(key, value);
+	        }
+			returnMap = AQICalculation.hourlyAQI(AQIMap);
+		}
+		
+		return returnMap;
+	}
 }

--
Gitblit v1.8.0