From 48bb075f91c5daf35cff0a16abe1136f132aafb4 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Sep 2020 15:40:26 +0800
Subject: [PATCH] 不同天气给定不同分数
---
src/main/java/com/moral/service/impl/ForecastWeatherServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 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..4e3457b 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,20 +193,37 @@
//������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)) {
condition = "100";
+ } else if ("���".equals(text)) {
+ condition = "90";
} else if ("������".equals(text)) {
condition = "80";
- } else if ("���".equals(text)) {
+ } else if ("���".equals(text)) {
+ condition = "70";
+ } else if ("���".equals(text) || "������".equals(text) || "������".equals(text) || "".equals(text)) {
condition = "60";
- } else if ("���������".equals(text) || "������".equals(text)) {
+ } else if ("������".equals(text)) {
+ condition = "45";
+ } else if ("���������".equals(text)) {
condition = "40";
+ } else if ("������������������".equals(text) || "���������������".equals(text)) {
+ condition = "30";
} else if ("������".equals(text)) {
condition = "20";
} else if ("���".equals(text)) {
+ condition = "10";
+ } else if ("������������������".equals(text)) {
+ condition = "5";
+ } else if ("������������������".equals(text)) {
+ condition = "4";
+ } else if ("������".equals(text) || "������".equals(text) || "������".equals(text)
+ || "������".equals(text) || "������".equals(text) || "������".equals(text)
+ || "���������".equals(text) || "���������������������������".equals(text) || "������".equals(text)
+ ) {
condition = "0";
} else {
condition = "50";
@@ -271,15 +289,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()));
- O3List = aqiMapper.getO3(map1);
- }
+ List<Map<String, Object>> O3List = new ArrayList<>();
List<Map<String, Object>> beamList = new ArrayList<>();
- if (map.get("macs") != null) {
- beamList = historyHourlyMapper.getBeamByMacs(map);
+ 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);
+ }
}
+
for (Map<String, Object> tempAndCloudMap : tempAndCloudList) {
String time1 = tempAndCloudMap.get("time").toString();
for (Map<String, Object> beamMap : beamList) {
--
Gitblit v1.8.0