From dad714704451fbcc04b48d4efcb460410e7a8aa0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 19 Aug 2020 14:47:32 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 100 +++++++++++++++++++++++++++++++++----------------
1 files changed, 67 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index b24743f..fb15d94 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -309,6 +309,7 @@
cal.add(Calendar.DAY_OF_MONTH, 1);
Date end = cal.getTime();
cal.setTime(sdf.parse(time));
+ Date time1 = cal.getTime();
cal.add(Calendar.DAY_OF_MONTH, -1);
String beforeDay = sdf.format(cal.getTime());
parameters.put("start", selectTime);
@@ -399,7 +400,8 @@
hashMap.put("end", endTime);
Map<String, Object> O3Map = forecastWeatherMapper.getO38Hours(hashMap);
if (O3Map != null) {
- 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)));
}
}
@@ -427,10 +429,14 @@
hashMap.put("time", aqiMap.get("time"));
Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(aqiMap.get("json").toString());
DecimalFormat df = new DecimalFormat(".####");
- double longitude = Double.valueOf(jsonMap.get("longitude").toString());
- double latitude = Double.valueOf(jsonMap.get("latitude").toString());
- jsonMap.put("longitude", df.format(longitude));
- jsonMap.put("latitude", df.format(latitude));
+ if (jsonMap.get("longitude") != null) {
+ double longitude = Double.valueOf(jsonMap.get("longitude").toString());
+ jsonMap.put("longitude", df.format(longitude));
+ }
+ if (jsonMap.get("latitude") != null) {
+ double longitude = Double.valueOf(jsonMap.get("latitude").toString());
+ jsonMap.put("latitude", df.format(longitude));
+ }
hashMap.putAll(jsonMap);
hashMap.put("city", parameters.get("name").toString());
realAqilist.add(hashMap);
@@ -448,6 +454,14 @@
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<>();
@@ -637,7 +651,7 @@
}
if (map.get("windScale") != null) {
String windScale = map.get("windScale").toString().replace("-", "~");
- map.put("windScale",windScale);
+ map.put("windScale", windScale);
}
}
@@ -650,38 +664,58 @@
}
for (Map<String, Object> resultMap : resultList) {
if (resultMap.get("type").equals("������")) {
- String rtime = resultMap.get("time").toString() + ":00";
- int rhour = Integer.valueOf(rtime.substring(11, 13));
- cal.setTime(sdf1.parse(rtime));
- cal.add(Calendar.HOUR_OF_DAY, -7);
- Date startTime = cal.getTime();
- Date endTime = sdf1.parse(format);
- Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));
- hashMap.put("start", startTime);
- hashMap.put("end", endTime);
- if (rhour == nowHour) {
- Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
- double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString());
- resultMap.put("goodValue", v);
- } 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", 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", v);
- } else if (rhour == nowHour + 3) {
- Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
- double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString()) / 4);
- resultMap.put("goodValue", v);
+ 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));
+ cal.add(Calendar.HOUR_OF_DAY, -7);
+ Date startTime = cal.getTime();
+ Date endTime = sdf1.parse(format);
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));
+ hashMap.put("start", startTime);
+ hashMap.put("end", endTime);
+ if (rhour == nowHour) {
+ Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
+ double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString());
+ resultMap.put("goodValue", v);
+ } 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)));
+ } 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);
+ resultMap.put("goodValue", String.valueOf(Math.round(v)));
+ }
}
+ }
+ if (resultMap.get("O3C_8H") != null && !resultMap.get("O3C_8H").equals("")) {
+ Double O3C_8H = Double.valueOf(resultMap.get("O3C_8H").toString());
+ resultMap.put("O3C_8H", String.valueOf(Math.round(O3C_8H)));
+ }
+
+ if (resultMap.get("PM25C") != null && !resultMap.get("PM25C").equals("")) {
+ Double PM25C = Double.valueOf(resultMap.get("PM25C").toString());
+ resultMap.put("PM25C", String.valueOf(Math.round(PM25C)));
+ }
+
+ if (resultMap.get("PM10C") != null && !resultMap.get("PM10C").equals("")) {
+ Double PM10C = Double.valueOf(resultMap.get("PM10C").toString());
+ resultMap.put("PM10C", String.valueOf(Math.round(PM10C)));
+ }
+
+ if (resultMap.get("O3C") != null && !resultMap.get("O3C").equals("")) {
+ Double O3C = Double.valueOf(resultMap.get("O3C").toString());
+ resultMap.put("O3C", String.valueOf(Math.round(O3C)));
}
}
return resultList;
}
-
@Override
public void updateForecastWeather(Map<String, Object> parameters) {
--
Gitblit v1.8.0