From 2e2861fd0bbba403a15a212c550bed9f8331f467 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 15 Jan 2018 17:14:13 +0800
Subject: [PATCH] 更新 查询
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 79 +++++++++++++++++++++++++++++++++++++--
src/main/resources/mapper/HistoryEntityMapper.xml | 17 ++++++++
src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java | 2 +
src/main/java/com/moral/monitor/service/ScreenService.java | 2 +
src/main/java/com/moral/monitor/controller/ScreenController.java | 3 +
5 files changed, 97 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ScreenController.java b/src/main/java/com/moral/monitor/controller/ScreenController.java
index 1376544..d2a8a0a 100644
--- a/src/main/java/com/moral/monitor/controller/ScreenController.java
+++ b/src/main/java/com/moral/monitor/controller/ScreenController.java
@@ -232,7 +232,8 @@
if (!parameters.containsKey("mac")) {
result.put("msg", "���������������������");
} else {
- result = screenService.getDayAQIBySensor(parameters);
+ //result = screenService.getDayAQIBySensor(parameters);
+ result = screenService.getDayAQIByDevice(parameters);
}
} catch (BusinessException be) {
be.printStackTrace();
diff --git a/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java b/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
index 130719e..77e4179 100644
--- a/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
+++ b/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java
@@ -15,4 +15,6 @@
List<Map<String, Object>> getEquipmentStates(Map<String, Object> parameters);
List<Map<String, Object>> getSensorsAverageByEquipment(Map<String, Object> parameters);
+
+ Map<String, Double> getDayAQIByDevice(Map<String, Object> parameters);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/monitor/service/ScreenService.java b/src/main/java/com/moral/monitor/service/ScreenService.java
index 5b7f81c..8d5ab77 100644
--- a/src/main/java/com/moral/monitor/service/ScreenService.java
+++ b/src/main/java/com/moral/monitor/service/ScreenService.java
@@ -21,4 +21,6 @@
Map<String, Object> getDayAQIBySensor(Map<String, Object> parameters) throws Exception;
+ Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
+
}
diff --git a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
index 338230a..50be408 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -1,6 +1,9 @@
package com.moral.monitor.service.impl;
-import java.util.ArrayList;
+import static org.apache.commons.lang3.time.DateUtils.addDays;
+import static org.apache.commons.lang3.time.DateUtils.truncate;
+import static org.springframework.util.ObjectUtils.isEmpty;
+
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
@@ -237,22 +240,29 @@
public Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters) {
Map<String, Object> result = new HashMap<String, Object>();
Date date = new Date();
- Long end = DateUtils.truncate(date, Calendar.DATE).getTime(),start;
+ //Long end = DateUtils.truncate(date, Calendar.DATE).getTime(),start;
+ Date end = DateUtils.truncate(date, Calendar.DATE),start;
+
// ���������������������������������������
if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {
// ���������1���00:00:00
- start = DateUtils.truncate(DateUtils.addMonths(date, -1), Calendar.MONTH).getTime();
+ //start = DateUtils.truncate(DateUtils.addMonths(date, -1), Calendar.MONTH).getTime();
+ start = DateUtils.truncate(DateUtils.addMonths(date, -1), Calendar.MONTH);
} else {
// ���������1���00:00:00
- start = DateUtils.truncate(date, Calendar.MONTH).getTime();
+ //start = DateUtils.truncate(date, Calendar.MONTH).getTime();
+ start = DateUtils.truncate(date, Calendar.MONTH);
}
+ start = DateUtils.addHours(start, 8);
+ end = DateUtils.addHours(end, 8);
Aggregation aggregation = Aggregation.newAggregation(
Aggregation.match(Criteria.where("mac").is(parameters.get("mac"))),
Aggregation.match(Criteria.where("time").gte(start)),
Aggregation.match(Criteria.where("time").lt(end)),
Aggregation.group("mac").avg((String) parameters.get("macKey")).as("avg")
);
- AggregationResults<BasicDBObject> results = mongoTemplate.aggregate(aggregation, "data",BasicDBObject.class);
+ //AggregationResults<BasicDBObject> results = mongoTemplate.aggregate(aggregation, "data",BasicDBObject.class);
+ AggregationResults<BasicDBObject> results = mongoTemplate.aggregate(aggregation, "data_hourly",BasicDBObject.class);
List<BasicDBObject> list = results.getMappedResults();
if (!ObjectUtils.isEmpty(list)) {
result = list.get(0);
@@ -326,4 +336,63 @@
}
return resultMap;
}
+
+ @Override
+ public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
+ Map<String, Object> resultMap = new HashMap<String, Object>();
+ Date date = new Date();
+ // ������00:00:00
+ parameters.put("start", truncate(addDays(date, -1), Calendar.DATE));
+ // ������00:00:00
+ parameters.put("end", truncate(date, Calendar.DATE));
+ String[] IAQIValues = ResourceUtil.getArrValue("IAQI");
+ Map<String, Double> average = historyMapper.getDayAQIByDevice(parameters);
+ if (isEmpty(average)) {
+ resultMap.put("AQI", "N/V");
+ } else {
+ Set<Double> IAQIs = new HashSet<Double>();
+ for (Map.Entry<String, Double> entry : average.entrySet()) {
+ double minMacKey = 0, maxMacKey = 0, minIAQI = 0, maxIAQI = 0;
+ String[] macKeyValues = ResourceUtil.getArrValue(entry.getKey());
+ Double avg = entry.getValue();
+ if (isEmpty(avg)) {
+ IAQIs.add(null);
+ } else {
+ int index = -1;
+ for (int i = 0; i < macKeyValues.length; i++) {
+ if (avg <= Double.valueOf(macKeyValues[i])) {
+ if (i == 0) {
+ index = i;
+ } else {
+ index = i - 1;
+ }
+ break;
+ }
+ }
+ if (index == -1) {
+ IAQIs.add(Double.MAX_VALUE);
+ } else {
+ minMacKey = Double.valueOf(macKeyValues[index]);
+ maxMacKey = Double.valueOf(macKeyValues[index + 1]);
+ minIAQI = Double.valueOf(IAQIValues[index]);
+ maxIAQI = Double.valueOf(IAQIValues[index + 1]);
+ Double result = calculateIAQI(maxIAQI, minIAQI, maxMacKey, minMacKey, avg);
+ IAQIs.add(result);
+ }
+ }
+ }
+ IAQIs.remove(null);
+ if (isEmpty(IAQIs)) {
+ resultMap.put("AQI", "N/V");
+ } else {
+ Double AQI = Collections.max(IAQIs);
+ if (AQI == Double.MAX_VALUE) {
+ resultMap.put("AQI", IAQIValues[IAQIValues.length - 1]);
+ } else {
+ resultMap.put("AQI", String.format("%.0f", AQI));
+ }
+ }
+ }
+ return resultMap;
+ }
}
diff --git a/src/main/resources/mapper/HistoryEntityMapper.xml b/src/main/resources/mapper/HistoryEntityMapper.xml
index 3089c66..2d1c61d 100644
--- a/src/main/resources/mapper/HistoryEntityMapper.xml
+++ b/src/main/resources/mapper/HistoryEntityMapper.xml
@@ -332,4 +332,21 @@
GROUP BY
time
</select>
+
+ <select id="getDayAQIByDevice" resultType="map">
+ SELECT
+ AVG(json -> '$.e1[0]') e1,
+ AVG(json -> '$.e2[0]') e2,
+ AVG(json -> '$.e10[0]') e10,
+ AVG(json -> '$.e11[0]') e11,
+ AVG(json -> '$.e15[0]') e15,
+ AVG(json -> '$.e16[0]') e16
+ FROM
+ data
+ WHERE
+ mac = #{mac}
+ AND time >= #{start}
+ AND time < #{end}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0