From 53217a560fecddcf8ff5b7583532f49381b14d80 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 24 Aug 2020 08:38:30 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index fb15d94..4c7881a 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -454,14 +454,6 @@
hashMap.put("end", endTime);
Map<String, Object> O3Map = hangzhouAqiMapper.getAvgO3EightHours(hashMap);
map.put("O3C_8H", O3Map.get("O3C_8H").toString());
- /*Double O3C_8H = Double.valueOf(O3Map.get("O3C_8H").toString());
- map.put("O3C_8H", String.valueOf(Math.round(O3C_8H)));
- Double PM25 = Double.valueOf(map.get("PM2_5").toString());
- map.put("PM2_5", String.valueOf(Math.round(PM25)));
- Double PM10 = Double.valueOf(map.get("PM10").toString());
- map.put("PM10", String.valueOf(Math.round(PM10)));
- Double O3 = Double.valueOf(map.get("O3").toString());
- map.put("O3", String.valueOf(Math.round(O3)));*/
}
//������
Map<String, Object> params = new HashMap<>();
@@ -664,7 +656,7 @@
}
for (Map<String, Object> resultMap : resultList) {
if (resultMap.get("type").equals("������")) {
- if (sdf.parse(time).getTime()==sdf.parse(sdf.format(now)).getTime()) {
+ if (sdf.parse(time).getTime() == sdf.parse(sdf.format(now)).getTime()) {
String rtime = resultMap.get("time").toString() + ":00";
int rhour = Integer.valueOf(rtime.substring(11, 13));
cal.setTime(sdf1.parse(rtime));
@@ -682,14 +674,14 @@
} else if (rhour == nowHour + 1) {
Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 2;
- resultMap.put("goodValue",String.valueOf(Math.round(v)));
+ resultMap.put("goodValue", String.valueOf(Math.round(v)));
} else if (rhour == nowHour + 2) {
Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 3;
resultMap.put("goodValue", String.valueOf(Math.round(v)));
} else if (rhour == nowHour + 3) {
Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
- double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString()) / 4);
+ double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 4;
resultMap.put("goodValue", String.valueOf(Math.round(v)));
}
}
@@ -714,6 +706,19 @@
resultMap.put("O3C", String.valueOf(Math.round(O3C)));
}
}
+
+ for (Map<String, Object> map : resultList) {
+ if (map.get("type").equals("������")) {
+ if (resultList.get(1).get("longitude") != null) {
+ String longitude = resultList.get(1).get("longitude").toString();
+ map.put("longitude",longitude);
+ }
+ if (resultList.get(1).get("latitude") != null) {
+ String latitude = resultList.get(1).get("latitude").toString();
+ map.put("latitude",latitude);
+ }
+ }
+ }
return resultList;
}
--
Gitblit v1.8.0