From 1707b3025ef72864abb7ef7e7cd844bd9b27f171 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 13 Nov 2019 16:28:39 +0800
Subject: [PATCH] 污染溯源sql查询优化
---
src/main/java/com/moral/controller/ScreenController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 2fa0196..20c720a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -21,6 +21,7 @@
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.log4j.Logger;
import org.dom4j.Document;
@@ -1210,7 +1211,13 @@
LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
int month = timeLocalDateTime.getMonth().getValue();
Point dirPoint = historyHourlyService.getDirPoint(parameters);
- Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceData(parameters);
+ Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);
+ if (MapUtils.isEmpty(getPollutionSourceData)) {
+ getPollutionSourceData = historyHourlyService.getPollutionSourceDataAll(parameters);
+ }
+ if (MapUtils.isEmpty(getPollutionSourceData)) {
+ getPollutionSourceData = new HashMap<>();
+ }
String mac = parameters.get("mac").toString();
Device device = deviceService.getDeviceByMac(mac, false);
JSONObject params = new JSONObject();
--
Gitblit v1.8.0