From f73c5a24b25280030deaaafe38b35b1e7439b9c3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Aug 2020 17:06:53 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java b/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java
index 52a8dd6..ee83dee 100644
--- a/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java
@@ -148,6 +148,9 @@
map1.put("typeFormat", "%Y-%m-%d %H:%i:%s");
map1.put("startTime", startTime);
map1.put("endTime", endTime);
+ hashmap.put("typeFormat", "%Y-%m-%d %H:%i:%s");
+ hashmap.put("startTime", startTime);
+ hashmap.put("endTime", endTime);
map1.put("cityCode", Integer.valueOf(hashmap.get("cityCode").toString()));
List<List<Map<String, Object>>> list1 = new ArrayList<>();
List<List<Map<String, Object>>> list2 = new ArrayList<>();
@@ -157,10 +160,12 @@
List<Map<String, Object>> list4 = new ArrayList<>();
if (i < 10) {
map1.put("time", "0" + i + ":00:00");
+ hashmap.put("time", "0" + i + ":00:00");
} else {
map1.put("time", i + ":00:00");
+ hashmap.put("time", i + ":00:00");
}
- List<Map<String, Object>> tempList = realWeatherMapper.getTemp(map1);
+ List<Map<String, Object>> tempList = realWeatherMapper.getTemp(hashmap);
List<Map<String, Object>> O3List = aqiMapper.getO3(map1);
if (O3List.size() == 0) {
map1.put("cityCode", Integer.valueOf(hashmap.get("parentCode").toString()));
@@ -197,7 +202,6 @@
}
if (list.get(0).size()!=0) {
-
if (list.get(0).get(0).size() > 2) {
List<Map<String, Object>> constantList = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
--
Gitblit v1.8.0