From 158a0ab4db8c34363e5460dbec287c8af1f0f277 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 24 Aug 2018 16:42:53 +0800
Subject: [PATCH] 天气 接口
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 4fd39e3..474d819 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -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());
}
});
@@ -291,7 +298,10 @@
Object type = parameters.get("type");
if ("year".equals(type) || "month".equals(type)) {
parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));
- resultMap.put("alarmData" + part, alarmDailyMapper.getAlarmData(parameters).get(0));
+ List<Map<String, Object>> alarmData = alarmDailyMapper.getAlarmData(parameters);
+ if (!ObjectUtils.isEmpty(alarmData)) {
+ resultMap.put("alarmData" + part, alarmDailyMapper.getAlarmData(parameters).get(0));
+ }
}
return resultMap;
}
--
Gitblit v1.8.0