From 152325bc4e51584bf68ed8b45012eb77bf226373 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 03 Apr 2018 10:47:05 +0800
Subject: [PATCH] 报表优化
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 62d4387..86fd7a0 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -273,19 +273,18 @@
List<String> sensorKeys = new ArrayList<String>();
Set<String> sensorsSet = new HashSet<String>();
- if (parameters.containsKey("sensorKeys")) {
+ if (parameters.containsKey("sensors")) {
List<String> sensors;
try {
sensors = JSON.parseObject((String)parameters.get("sensors"), new TypeReference<List<String>>() {});
- parameters.put("sensors", new HashSet<String>(sensors));
for (String sensor : sensors) {
sensorKeys.add(sensor.split("-")[0]);
}
} catch (Exception e) {
- sensorKeys = (List<String>)parameters.get("sensorKeys");
- sensors = sensorKeys;
+ sensors = (List<String>)parameters.remove("sensors");
+ sensorKeys.addAll(sensors);
}
- sensorsSet = new HashSet<String>(sensors);
+ sensorsSet.addAll(sensors);
} else {
List<Sensor> sensors = sensorMapper.getSensorsByCriteria(parameters);
for (Sensor sensor : sensors) {
--
Gitblit v1.8.0