From 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 24 Jul 2018 11:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 648b3cc..07679a4 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -69,7 +69,7 @@
@Override
public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
- ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+ //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
LocalDate localDate = LocalDate.now();
// ������00:00:00
parameters.put("start", localDate.minusDays(1));
@@ -186,7 +186,8 @@
Set<String> sensors = new TreeSet<String>(new Comparator<String>() {
@Override
public int compare(String o1, String o2) {
- return Integer.compare(Integer.valueOf(o1.split("-")[0].replace("e", "")), Integer.valueOf(o2.split("-")[0].replace("e", "")));
+ return o1.split("-")[0].compareTo(o2.split("-")[0]);
+ //return Integer.compare(Integer.valueOf(o1.split("-")[0].replace("e", "")), Integer.valueOf(o2.split("-")[0].replace("e", "")));
}
});
Map<String, Double> sortMap = new HashMap<String, Double>();
@@ -230,14 +231,20 @@
if (o2.getValue().compareTo(o1.getValue()) == 0) {
String[] key1 = o1.getKey().split("-");
String[] key2 = o2.getKey().split("-");
- String sensor1 = key1[0].replace("e", "");
- String sensor2 = key2[0].replace("e", "");
- if (Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2)) == 0) {
+// String sensor1 = key1[0].replace("e", "");
+// String sensor2 = key2[0].replace("e", "");
+// if (Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2)) == 0) {
+// return Integer.compare(Integer.valueOf(key1[1]), Integer.valueOf(key2[1]));
+// }
+// return Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2));
+ if (key1[0].compareTo(key2[0]) == 0) {
return Integer.compare(Integer.valueOf(key1[1]), Integer.valueOf(key2[1]));
+ } else {
+ return key1[0].compareTo(key2[0]);
}
- return Integer.valueOf(sensor1).compareTo(Integer.valueOf(sensor2));
+ } else {
+ return o2.getValue().compareTo(o1.getValue());
}
- return o2.getValue().compareTo(o1.getValue());
}
});
@@ -352,8 +359,9 @@
@Override
public Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters) {
- ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
- ValidateUtil.notNull(parameters.get("macKey"), "param.is.null");
+ //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
+ Object sensorKey = parameters.remove("macKey");
+ ValidateUtil.notNull(sensorKey, "param.is.null");
Map<String, Object> result = new HashMap<String, Object>();
LocalDate end = LocalDate.now(),start;
// ���������������������������������������
@@ -366,10 +374,7 @@
}
parameters.put("start", start);
parameters.put("end", end);
- String sensorKey = (String) parameters.remove("macKey");
- List<String> sensorKeys = new ArrayList<String>();
- sensorKeys.add(sensorKey);
- parameters.put("sensorKeys", sensorKeys);
+ parameters.put("sensorKeys", Arrays.asList(sensorKey));
Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);
if (isEmpty(average)) {
--
Gitblit v1.8.0