From f5b46438bf9d2ff9900c6db3474d13ddca03ceca Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 18 Aug 2020 15:51:54 +0800
Subject: [PATCH] 更新风级格式
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 142 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 118 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 106f60d..b24743f 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.service.impl;
+import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -233,8 +234,8 @@
hour = "24";
}
map.put("time", Integer.valueOf(hour));
- if (forecastMap.get("result") != null) {
- values.add(forecastMap.get("result").toString().replace("\"", ""));
+ if (forecastMap.get("O3") != null) {
+ values.add(forecastMap.get("O3").toString().replace("\"", ""));
} else {
values.add("");
}
@@ -251,8 +252,8 @@
hour = "24";
}
map.put("time", Integer.valueOf(hour));
- if (forecastMap.get("result") != null) {
- values.add(forecastMap.get("result").toString().replace("\"", ""));
+ if (forecastMap.get("O3") != null) {
+ values.add(forecastMap.get("O3").toString().replace("\"", ""));
} else {
values.add("");
}
@@ -312,41 +313,45 @@
String beforeDay = sdf.format(cal.getTime());
parameters.put("start", selectTime);
parameters.put("end", end);
- Integer fcode=0;
+ Integer fcode = 0;
List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecast(parameters);
if (forecastList.size() == 0) {
List<Area> areaList = areaMapper.getAreaByCityCode(code);
for (Area area1 : areaList) {
if (area1 != null) {
parameters.put("cityCode", area1.getAreaCode());
- fcode=area1.getAreaCode();
+ fcode = area1.getAreaCode();
forecastList = forecastWeatherMapper.getForecast(parameters);
if (forecastList.size() != 0) {
break;
}
}
}
- }else {
- fcode= Integer.valueOf(parameters.get("cityCode").toString());
+ } else {
+ fcode = Integer.valueOf(parameters.get("cityCode").toString());
}
List<Map<String, Object>> foreList = new ArrayList<>();
for (Map<String, Object> forecastMap : forecastList) {
Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("time", forecastMap.get("time").toString());
+ String ftime = forecastMap.get("time").toString();
+ hashMap.put("time", ftime);
hashMap.put("type", "������");
hashMap.put("TVOC", "");
hashMap.put("altitude", "");
hashMap.put("vegetation", "");
+ hashMap.put("river", "");
hashMap.put("AQI", "");
hashMap.put("SO2C", "");
hashMap.put("NO2C", "");
hashMap.put("COC", "");
- hashMap.put("O3C", "");
+ if (forecastMap.get("O3C") == null) {
+ hashMap.put("O3C", "");
+ }
hashMap.put("PM25C", "");
hashMap.put("PM10C", "");
hashMap.put("city", parameters.get("name").toString());
- hashMap.put("code",fcode);
+ hashMap.put("code", fcode);
if (sdf.parse(time).getTime() <= now.getTime()) {
hashMap.put("fxTime", (beforeDay + " 15:00").substring(5, 16));
} else {
@@ -364,6 +369,7 @@
foreList.add(hashMap);
}
+ //������6���������������
for (Map<String, Object> foreMap : foreList) {
String ftime = foreMap.get("time").toString();
Date endTime = sdf1.parse(ftime);
@@ -381,10 +387,26 @@
}
}
+ //������O3C_8H
+ for (Map<String, Object> map : foreList) {
+ Date endTime = sdf1.parse(map.get("time").toString());
+ cal.setTime(endTime);
+ cal.add(Calendar.HOUR, -8);
+ Date startTime = cal.getTime();
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));
+ hashMap.put("start", startTime);
+ hashMap.put("end", endTime);
+ Map<String, Object> O3Map = forecastWeatherMapper.getO38Hours(hashMap);
+ if (O3Map != null) {
+ map.put("O3C_8H", O3Map.get("O3C_8H").toString());
+ }
+ }
+
String ac = parameters.get("cityCode").toString();
List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqi(parameters);
if (aqiList.size() == 0) {
- parameters.put("cityCode", code);//320500
+ parameters.put("cityCode", code);
aqiList = hangzhouAqiMapper.getAqi(parameters);
if (aqiList.size() == 0) {
List<Area> areaList = areaMapper.getAreaByCityCode(code);
@@ -404,12 +426,19 @@
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());
+ 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));
hashMap.putAll(jsonMap);
hashMap.put("city", parameters.get("name").toString());
realAqilist.add(hashMap);
}
+
for (Map<String, Object> map : realAqilist) {
- Date endTime = sdf1.parse(map.get("time").toString());
+ String rtime = map.get("time").toString();
+ Date endTime = sdf1.parse(rtime);
cal.setTime(endTime);
cal.add(Calendar.HOUR, -8);
Date startTime = cal.getTime();
@@ -421,7 +450,6 @@
map.put("O3C_8H", O3Map.get("O3C_8H").toString());
}
//������
-
Map<String, Object> params = new HashMap<>();
if (ac.endsWith("00")) {
params.put("cityCode", Integer.valueOf(ac));
@@ -437,17 +465,34 @@
}
List<Device> deviceList = deviceMapper.getDeviceListByMonitorPointIds(pointList);
List<String> macList = new ArrayList<>();
+ List<String> macList1 = new ArrayList<>();
List<Map<String, Object>> beamList = new ArrayList<>();
+ List<Map<String, Object>> tvocList = new ArrayList<>();
if (deviceList.size() != 0) {
for (Device device : deviceList) {
- String mac = device.getMac();
- macList.add(mac);
+ macList.add(device.getMac());
}
parameters.put("macs", macList);
beamList = historyHourlyMapper.getBeamByMacs(parameters);
+ Map<String, Object> map = new HashMap<>();
+ if (name.equals("���������")) {
+ List<Integer> list = new ArrayList<>();
+ list.add(48);
+ List<Device> pointIds = deviceMapper.getDeviceListByMonitorPointIds(list);
+ for (Device device : pointIds) {
+ if (device.getId() != 1075) {
+ macList1.add(device.getMac());
+ }
+ }
+ } else {
+ macList1 = macList;
+ }
+ map.put("macs", macList1);
+ map.put("start", parameters.get("start"));
+ map.put("end", parameters.get("end"));
+ tvocList = historyHourlyMapper.getTVOCByMacs(map);
}
-
List<Map<String, Object>> realList = realWeatherMapper.getRealWeather(parameters);
List<Map<String, Object>> realWeatherList = new ArrayList<>();
for (Map<String, Object> realMap : realList) {
@@ -482,6 +527,14 @@
if (precip6HourMap != null) {
realMap.put("precip6", precip6HourMap.get("precip6").toString());
}
+
+ for (Map<String, Object> tvocMap : tvocList) {
+ String ttime = tvocMap.get("time").toString();
+ if (ttime.equals(rtime)) {
+ realMap.put("TVOC", tvocMap.get("TVOC").toString());
+ }
+ }
+
}
List<Map<String, Object>> list = new ArrayList<>();
@@ -535,14 +588,13 @@
}
}
}
-
for (int i = list.size(); i < foreList.size(); i++) {
Map<String, Object> map = foreList.get(i);
resultList.add(map);
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("time", map.get("time").toString());
hashMap.put("type", "������");
- hashMap.put("city", parameters.get("city").toString());
+ hashMap.put("city", parameters.get("name").toString());
resultList.add(hashMap);
}
@@ -569,7 +621,7 @@
map.put("SO2C", map.get("SO2").toString());
}
if ((!map.containsKey("NO2C")) && map.containsKey("NO2")) {
- map.put("SO2C", map.get("SO2").toString());
+ map.put("NO2C", map.get("NO2").toString());
}
if ((!map.containsKey("O3C")) && map.containsKey("O3")) {
map.put("O3C", map.get("O3").toString());
@@ -577,13 +629,55 @@
if ((!map.containsKey("COC")) && map.containsKey("CO")) {
map.put("COC", map.get("CO").toString());
}
- if ((!map.containsKey("PM25C")) && map.containsKey("PM25")) {
- map.put("PM25C", map.get("PM25").toString());
+ if ((!map.containsKey("PM25C")) && map.containsKey("PM2_5")) {
+ map.put("PM25C", map.get("PM2_5").toString());
}
if ((!map.containsKey("PM10C")) && map.containsKey("PM10")) {
map.put("PM10C", map.get("PM10").toString());
}
+ if (map.get("windScale") != null) {
+ String windScale = map.get("windScale").toString().replace("-", "~");
+ map.put("windScale",windScale);
+ }
+ }
+ //���4���������������
+ double value = 160.0 * 8;
+ int nowHour = Integer.valueOf(sdf1.format(now).substring(11, 13));
+ String format = sdf1.format(now).substring(0, 13) + ":00:00";
+ if (nowHour < 8) {
+ return resultList;
+ }
+ 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);
+ }
+ }
}
return resultList;
}
@@ -613,10 +707,10 @@
String time = map.get("time").toString() + ":00";
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("time", time);
- hashMap.put("cityCode",Integer.valueOf(map.get("code").toString()));
+ hashMap.put("cityCode", Integer.valueOf(map.get("code").toString()));
Map<String, Object> jsonMap = new HashMap<>();
for (String key : map.keySet()) {
- if (!key.equals("city") && !key.equals("time") && !key.equals("type") && !key.equals("fxTime")) {
+ if (!key.equals("city") && !key.equals("time") && !key.equals("type") && !key.equals("fxTime") && !key.equals("code")) {
String value = map.get(key).toString();
jsonMap.put(key, value);
}
--
Gitblit v1.8.0