From 5a292756180242c83dcb4603a7c425b52be69f6d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 21 Sep 2020 14:50:37 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java b/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java
index 6abf51b..bbe110c 100644
--- a/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java
@@ -130,11 +130,12 @@
bmap.put("cityCode", 110000);
bmap.put("parentCode", 110000);
hashSet.add(bmap);
- Map<String, Object> kunShanMap = new HashMap<>();
- kunShanMap.put("name1", "���������");
- kunShanMap.put("parentName", "���������");
- kunShanMap.put("cityCode", 320500);
- hashSet.add(kunShanMap);
+ Map<String, Object> smap = new HashMap<>();
+ smap.put("name1", "���������");
+ smap.put("parentName", "���������");
+ smap.put("cityCode", 320500);
+ smap.put("parentCode", 320000);
+ hashSet.add(smap);
List<Element> elements = Dom4jUtils.readDocument();
String cityID = "101190404";
@@ -192,7 +193,7 @@
//������km/h->m/s
Double windSpeed = Double.valueOf(nextDayMap.get("windSpeed").toString());
windSpeed = windSpeed * 1000 / 3600;
- nextDayMap.put("windSpeed",df.format(windSpeed));
+ nextDayMap.put("windSpeed", df.format(windSpeed));
String text = nextDayMap.get("text").toString();
String condition = "";
if ("���".equals(text)) {
@@ -271,15 +272,19 @@
map.put("times", times);
map1.put("times", times);
map1.put("time", hour);
- List<Map<String, Object>> O3List = aqiMapper.getO3(map1);
- if (O3List.size() == 0) {
- map1.put("cityCode", Integer.valueOf(map.get("parentCode").toString()));
+ List<Map<String, Object>> O3List = new ArrayList<>();
+ List<Map<String, Object>> beamList=new ArrayList<>();
+ if (times.size() != 0) {
O3List = aqiMapper.getO3(map1);
+ if (O3List.size() == 0) {
+ map1.put("cityCode", Integer.valueOf(map.get("parentCode").toString()));
+ O3List = aqiMapper.getO3(map1);
+ }
+ if (map.get("macs") != null) {
+ beamList = historyHourlyMapper.getBeamByMacs(map);
+ }
}
- List<Map<String, Object>> beamList = new ArrayList<>();
- if (map.get("macs") != null) {
- beamList = historyHourlyMapper.getBeamByMacs(map);
- }
+
for (Map<String, Object> tempAndCloudMap : tempAndCloudList) {
String time1 = tempAndCloudMap.get("time").toString();
for (Map<String, Object> beamMap : beamList) {
--
Gitblit v1.8.0