From e4478db5cb30396bf862fdab12ffecbc574a72e6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 19 Nov 2020 16:02:27 +0800
Subject: [PATCH] 大屏O3预测与实测对比更新
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 135 ++++++++++++++++++++++----------------------
1 files changed, 68 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index adcee3a..b584f82 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -197,31 +197,40 @@
parameters.put("start", sdf.parse(time));
parameters.put("end", sdf.parse(nextDay));
MonitorPoint monitorPoint = monitorPointMapper.selectByPrimaryKey(Integer.valueOf(monitorPointId));
+ int cityCode;
+ int parentCode;
if (monitorPoint.getAreaCode() == null) {
- parameters.put("cityCode", monitorPoint.getCityCode());
+ cityCode = monitorPoint.getCityCode();
+ parentCode = monitorPoint.getProvinceCode();
} else {
- parameters.put("cityCode", monitorPoint.getAreaCode());
+ cityCode = monitorPoint.getAreaCode();
+ parentCode = monitorPoint.getCityCode();
}
+ parameters.put("cityCode", cityCode);
+ //������O3
List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
- List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecastHour(parameters);
-
String timeUnits = time.substring(0, 4);
if (aqiList.size() == 0) {
parameters.put("timeUnits", timeUnits);
aqiList = hangzhouAqiMapper.getHistoryO3(parameters);
if (aqiList.size() == 0) {
- parameters.put("cityCode", monitorPoint.getCityCode());
+ parameters.put("cityCode", parentCode);
aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
if (aqiList.size() == 0) {
- parameters.put("cityCode", monitorPoint.getAreaCode());
aqiList = hangzhouAqiMapper.getHistoryO3(parameters);
}
}
}
-
+ //������O3
+ parameters.put("cityCode", cityCode);
+ List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecastHour(parameters);
+ if (forecastList.size() == 0) {
+ parameters.put("cityCode", parentCode);
+ forecastList = forecastWeatherMapper.getForecastHour(parameters);
+ }
for (Map<String, Object> map : aqiList) {
- String O3 = map.get("O3").toString().replace("\"", "");
- map.put("O3", O3);
+ int s = (int)Double.parseDouble(map.get("O3").toString().replace("\"", ""));
+ map.put("O3", String.valueOf(s));
}
List<Map<String, Object>> resultList = new ArrayList<>();
@@ -372,6 +381,9 @@
City city = cityMapper.getCityByName(cityName);
if (city == null) {
Province province = provinceMapper.getProvinceByName(cityName);
+ if (province == null) {
+ return new ArrayList<>();
+ }
code = province.getProvinceCode();
name = province.getProvinceName();
parentCode = 0;
@@ -409,6 +421,7 @@
Date end = cal.getTime();
cal.setTime(sdf.parse(time));
cal.add(Calendar.DAY_OF_MONTH, -1);
+ //������������������������������������������������������������������
String beforeDay = sdf.format(cal.getTime());
parameters.put("start", selectTime);
parameters.put("end", end);
@@ -418,46 +431,40 @@
if (!String.valueOf(code).endsWith("0000")) {
parameters.put("cityCode", parentCode);
forecastList = forecastWeatherMapper.getForecast(parameters);
+ } else {
+ return new ArrayList<>();
}
}
-
- //���������������������������07,15���������������
- List<Map<String, Object>> foreList = new ArrayList<>();
+ //���������������������������07,15������������������
for (Map<String, Object> forecastMap : forecastList) {
- Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("time", forecastMap.get("time").toString());
- hashMap.put("type", "������");
- hashMap.put("city", name);
+ forecastMap.put("type", "������");
+ forecastMap.put("city", name);
if (sdf.parse(time).getTime() <= now.getTime()) {
- hashMap.put("fxTime", (beforeDay + " 15:00").substring(5, 16));
+ forecastMap.put("fxTime", (beforeDay + " 15:00").substring(5, 16));
} else {
String format = sdf1.format(now).split(" ")[0];
Date date1 = sdf1.parse(format + " 07:00:00");
Date date2 = sdf1.parse(format + " 15:00:00");
if (now.getTime() > date2.getTime()) {
- hashMap.put("fxTime", (beforeDay + " 15:00").substring(5, 16));
+ forecastMap.put("fxTime", (beforeDay + " 15:00").substring(5, 16));
} else if (now.getTime() > date1.getTime()) {
- hashMap.put("fxTime", (beforeDay + " 07:00").substring(5, 16));
+ forecastMap.put("fxTime", (beforeDay + " 07:00").substring(5, 16));
}
}
- Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(forecastMap.get("json").toString());
- hashMap.putAll(jsonMap);
- foreList.add(hashMap);
- }
-
- for (Map<String, Object> foreMap : foreList) {
+ Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(forecastMap.remove("json").toString());
+ forecastMap.putAll(jsonMap);
+ //������������������6������������������
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("cityCode", parameters.get("cityCode").toString());
- Date endTime = sdf1.parse(foreMap.get("time").toString());
+ Date endTime = sdf1.parse(forecastMap.get("time").toString());
hashMap.put("end", endTime);
- //������6������������������(������)
cal.setTime(endTime);
cal.add(Calendar.HOUR, -6);
Date startTime = cal.getTime();
hashMap.put("start", startTime);
Map<String, Object> precip6HourMap = forecastWeatherMapper.getPrecip6Hour(hashMap);
if (precip6HourMap != null) {
- foreMap.put("precip6", precip6HourMap.get("precip6").toString());
+ forecastMap.put("precip6", precip6HourMap.get("precip6").toString());
}
//������8������O3���������(������)
cal.setTime(endTime);
@@ -466,19 +473,21 @@
hashMap.put("start", startTime);
Map<String, Object> O3Map = forecastWeatherMapper.getO38Hours(hashMap);
if (O3Map != null) {
- foreMap.put("O3C_8H", O3Map.get("O3_8H").toString());
+ forecastMap.put("O3C_8H", O3Map.get("O3_8H").toString());
}
+
}
+
//������������aqi
parameters.put("cityCode", code);
- //���hangzhou_aqi���������������������history_aqi_���������������
+ //���hangzhou_aqi���������������������history_aqi���������������
int p = 0;
- String timeUnits1 = time.substring(5, 7);
- String timeUnits2 = sdf1.format(end).substring(5, 7);
+ String timeUnits1 = time.substring(0, 4);
+ String timeUnits2 = sdf1.format(end).substring(0, 4);
List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqi(parameters);
if (aqiList.size() == 0) {
p = 1;
- //1-23���������������������������������������������������������������������
+ //1-23���������������������������00������������������
parameters.put("timeUnits", timeUnits1);
List<Map<String, Object>> aqiList1 = hangzhouAqiMapper.getHistoryAqi(parameters);
parameters.put("timeUnits", timeUnits2);
@@ -503,11 +512,10 @@
}
DecimalFormat df = new DecimalFormat(".####");
DecimalFormat df1 = new DecimalFormat("#.#");
- List<Map<String, Object>> realAqilist = new ArrayList<>();
for (Map<String, Object> aqiMap : aqiList) {
- Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("time", aqiMap.get("time"));
- Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(aqiMap.get("json").toString());
+ aqiMap.put("type", "������");
+ aqiMap.put("city", name);
+ Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(aqiMap.remove("json").toString());
for (String key : jsonMap.keySet()) {
if ("NO2".equals(key) || "NO2C".equals(key) || "O3".equals(key) || "O3C".equals(key) ||
"SO2".equals(key) || "SO2C".equals(key) || "PM2_5".equals(key) || "PM25C".equals(key) || "PM10".equals(key) || "PM10C".equals(key)) {
@@ -520,16 +528,11 @@
long AQI = Math.round(Double.valueOf(jsonMap.get(key).toString()));
jsonMap.put(key, String.valueOf(AQI));
}
-
}
- hashMap.putAll(jsonMap);
- hashMap.put("city", name);
- realAqilist.add(hashMap);
- }
+ aqiMap.putAll(jsonMap);
- //������o3_8H(������)
- for (Map<String, Object> map : realAqilist) {
- String s = map.get("time").toString();
+ //������O3_8H(������)
+ String s = aqiMap.get("time").toString();
Date endTime = sdf1.parse(s);
cal.setTime(endTime);
cal.add(Calendar.HOUR, -8);
@@ -538,15 +541,16 @@
hashMap.put("cityCode", parameters.get("cityCode").toString());
hashMap.put("start", startTime);
hashMap.put("end", endTime);
- Map<String, Object> O3Map = new HashMap<>();
+ Map<String, Object> O3Map;
if (p == 0) {
O3Map = hangzhouAqiMapper.getAvgO3EightHours(hashMap);
} else {
hashMap.put("time", endTime);
- hashMap.put("timeUnits", s.substring(5, 7));
+ hashMap.put("timeUnits", s.substring(0, 4));
O3Map = hangzhouAqiMapper.getHistoryO3EightHours(hashMap);
}
- map.put("O3C_8H", O3Map.get("O3_8H").toString().replace("\"", ""));
+ aqiMap.put("O3C_8H", O3Map.get("O3_8H").toString().replace("\"", ""));
+
}
//������������������������������������������������������tvoc
Map<String, Object> params = new HashMap<>();
@@ -572,10 +576,10 @@
parameters.put("cityCode", code);
List<Map<String, Object>> realList = realWeatherMapper.getRealWeather(parameters);
if (realList.size() == 0) {
- //1-23���������������������������������������������������������������������
+ //1-23���������������������������00������������������
x = 1;
- timeUnits1 = time.substring(5, 7);
- timeUnits2 = sdf1.format(end).substring(5, 7);
+ timeUnits1 = time.substring(0, 4);
+ timeUnits2 = sdf1.format(end).substring(0, 4);
parameters.put("timeUnits", timeUnits1);
List<Map<String, Object>> realList1 = realWeatherMapper.getHistoryWeather(parameters);
parameters.put("timeUnits", timeUnits2);
@@ -598,22 +602,19 @@
}
}
}
- List<Map<String, Object>> realWeatherList = new ArrayList<>();
for (Map<String, Object> realMap : realList) {
- Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("time", realMap.get("time"));
Map<String, Object> jsonMap;
if (x == 0) {
- jsonMap = (Map<String, Object>) JSONObject.parse(realMap.get("json").toString());
+ jsonMap = (Map<String, Object>) JSONObject.parse(realMap.remove("json").toString());
} else {
- jsonMap = (Map<String, Object>) JSONObject.parse(realMap.get("value").toString());
+ jsonMap = (Map<String, Object>) JSONObject.parse(realMap.remove("value").toString());
}
- hashMap.putAll(jsonMap);
- hashMap.put("city", name);
- realWeatherList.add(hashMap);
+ realMap.putAll(jsonMap);
+ realMap.put("city", name);
+ realMap.put("type", "������");
}
- //Tvoc,������������
+ //TVOC,������������
for (Map<String, Object> beamMap : beamList) {
for (Map<String, Object> tvocMap : tvocList) {
Object bTime = beamMap.get("time");
@@ -645,7 +646,7 @@
}
}
- for (Map<String, Object> realMap : realWeatherList) {
+ for (Map<String, Object> realMap : realList) {
if (time1.equals(realMap.get("time"))) {
map1.putAll(realMap);
}
@@ -670,7 +671,7 @@
listMap.put("type", "������");
listMap.put("city", name);
String time1 = listMap.get("time").toString();
- for (Map<String, Object> aqiMap : realAqilist) {
+ for (Map<String, Object> aqiMap : aqiList) {
if (time1.equals(aqiMap.get("time"))) {
listMap.putAll(aqiMap);
}
@@ -678,7 +679,7 @@
}
List<Map<String, Object>> resultList = new ArrayList<>();
- if (foreList.size() == 0) {
+ if (forecastList.size() == 0) {
cal.setTime(selectTime);
for (long d = cal.getTimeInMillis(); d < end.getTime();
cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) + 1),
@@ -687,11 +688,11 @@
hashMap.put("type", "������");
hashMap.put("city", name);
hashMap.put("time", sdf1.format(d));
- foreList.add(hashMap);
+ forecastList.add(hashMap);
}
}
- for (Map<String, Object> foreMap : foreList) {
+ for (Map<String, Object> foreMap : forecastList) {
for (Map<String, Object> realMap : list) {
if (foreMap.get("time").equals(realMap.get("time"))) {
resultList.add(foreMap);
@@ -699,8 +700,8 @@
}
}
}
- for (int i = list.size(); i < foreList.size(); i++) {
- Map<String, Object> map = foreList.get(i);
+ for (int i = list.size(); i < forecastList.size(); i++) {
+ Map<String, Object> map = forecastList.get(i);
resultList.add(map);
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("time", map.get("time").toString());
--
Gitblit v1.8.0