From 0670dde143770e6b9f3a3a91e1768e5acd504126 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 07 Aug 2020 18:02:41 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 340 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 257 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 62d3544..781a6bc 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -24,13 +24,16 @@
import com.moral.entity.Area;
import com.moral.entity.AreaNames;
import com.moral.entity.City;
+import com.moral.entity.Device;
import com.moral.entity.MonitorPoint;
import com.moral.entity.Organization;
import com.moral.entity.Province;
import com.moral.mapper.AreaMapper;
import com.moral.mapper.CityMapper;
+import com.moral.mapper.DeviceMapper;
import com.moral.mapper.ForecastWeatherMapper;
import com.moral.mapper.HangzhouAqiMapper;
+import com.moral.mapper.HistoryHourlyMapper;
import com.moral.mapper.MonitorPointMapper;
import com.moral.mapper.ProvinceMapper;
import com.moral.mapper.RealWeatherMapper;
@@ -63,6 +66,12 @@
@Resource
private RealWeatherMapper realWeatherMapper;
+
+ @Resource
+ private DeviceMapper deviceMapper;
+
+ @Resource
+ private HistoryHourlyMapper historyHourlyMapper;
@Override
public Map<String, Object> getWeatherDataByRegion(Map<String, Object> parameters) {
@@ -167,6 +176,7 @@
@Override
public List<Map<String, Object>> getForecastAndReal(Map<String, Object> parameters) throws ParseException {
+ parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");
String monitorPointId = parameters.get("monitorPointId").toString();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String time = parameters.get("time").toString() + " 00:00:00";
@@ -178,21 +188,22 @@
String nextDay = sdf.format(c.getTime());
parameters.put("start", sdf.parse(time));
parameters.put("end", sdf.parse(nextDay));
+ MonitorPoint monitorPoint = monitorPointMapper.selectByPrimaryKey(Integer.valueOf(monitorPointId));
+
+ //List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecastHour(parameters);
+
+ if (monitorPoint.getAreaCode() == null) {
+ parameters.put("cityCode", monitorPoint.getCityCode());
+ } else {
+ parameters.put("cityCode", monitorPoint.getAreaCode());
+ }
+ List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecastHour(parameters);
- MonitorPoint monitorPoint = monitorPointMapper.selectByPrimaryKey(Integer.valueOf(monitorPointId));
- parameters.put("areaCode", monitorPoint.getAreaCode());
- String sensors = "O3C";
- String sensor1 = "O3";
- parameters.put("sensors", sensors);
- parameters.put("sensors1", sensor1);
- parameters.put("sensors2", sensor1);
- List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
if (aqiList.size() == 0) {
- parameters.put("areaCode", monitorPoint.getCityCode());
+ parameters.put("cityCode", monitorPoint.getCityCode());
aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
}
-
for (Map<String, Object> map : aqiList) {
String O3 = map.get("O3").toString().replace("\"", "");
map.put("O3", O3);
@@ -211,7 +222,7 @@
}
map.put("time", Integer.valueOf(hour));
values.add("");
- values.add(aqiMap.get(sensor1).toString());
+ values.add(aqiMap.get("O3").toString());
map.put("values", values);
resultList.add(map);
}
@@ -225,7 +236,11 @@
hour = "24";
}
map.put("time", Integer.valueOf(hour));
- values.add(forecastMap.get("result").toString().replace("\"", ""));
+ if (forecastMap.get("result") != null) {
+ values.add(forecastMap.get("result").toString().replace("\"", ""));
+ } else {
+ values.add("");
+ }
values.add("");
map.put("values", values);
resultList.add(map);
@@ -239,10 +254,14 @@
hour = "24";
}
map.put("time", Integer.valueOf(hour));
- values.add(forecastMap.get("result").toString().replace("\"", ""));
+ if (forecastMap.get("result") != null) {
+ values.add(forecastMap.get("result").toString().replace("\"", ""));
+ } else {
+ values.add("");
+ }
for (Map<String, Object> aqiMap : aqiList) {
if (forecastMap.get("time").equals(aqiMap.get("time"))) {
- values.add(aqiMap.get(sensor1).toString());
+ values.add(aqiMap.get("O3").toString());
}
}
map.put("values", values);
@@ -260,63 +279,118 @@
@Override
public List<Map<String, Object>> getWeatherData(Map<String, Object> parameters) throws ParseException {
+ parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");
String cityName = parameters.get("city").toString();
Area area = areaMapper.getAreaByName(cityName);
MonitorPoint monitorPoint;
- Integer areaCode = 0;
- Integer cityCode = 0;
+ Integer parentCode = 0;
+ Integer code = 0;
+ String name = "";
if (area == null) {
City city = cityMapper.getCityByName(cityName);
if (city == null) {
Province province = provinceMapper.getProvinceByName(cityName);
- Integer provinceCode = province.getProvinceCode();
- monitorPoint = monitorPointMapper.getFirstMonitorPointByProvinceCode(provinceCode);
- parameters.put("areaCode", provinceCode);
- parameters.put("city", province.getProvinceName());
+ code = province.getProvinceCode();
+ name = province.getProvinceName();
} else {
- cityCode = city.getCityCode();
- monitorPoint = monitorPointMapper.getFirstMonitorPointByCityCode(cityCode);
- parameters.put("areaCode", cityCode);
- parameters.put("city", city.getCityName());
+ code = city.getCityCode();
+ parentCode = city.getProvinceCode();
+ name = city.getCityName();
}
} else {
- areaCode = area.getAreaCode();
- monitorPoint = monitorPointMapper.getFirstMonitorPointByAreaCode(areaCode);
- cityCode = area.getCityCode();
- parameters.put("areaCode", areaCode);
- parameters.put("city", area.getAreaName());
+ code = area.getAreaCode();
+ parentCode = area.getCityCode();
+ name = area.getAreaName();
}
- if (monitorPoint == null) {
- return new ArrayList<>();
- }
- parameters.put("monitorPointId", monitorPoint.getId());
+
+ parameters.put("cityCode", code);
+ parameters.put("name", name);
+ parameters.put("areaCode", code);
+
+
String time = parameters.get("time").toString();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- Calendar c = Calendar.getInstance();
- c.setTime(sdf.parse(time));
- c.add(Calendar.HOUR_OF_DAY, 1);
- Date start = c.getTime();
- c.add(Calendar.DAY_OF_MONTH, 1);
- Date end = c.getTime();
- parameters.put("start", start);
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date now = new Date();
+ Date selectTime = sdf1.parse(time + " 01:00:00");
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(selectTime);
+ cal.add(Calendar.DAY_OF_MONTH, 1);
+ 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);
List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecast(parameters);
+ if (forecastList.size() == 0) {
+ parameters.put("cityCode", parentCode);
+ forecastList = forecastWeatherMapper.getForecast(parameters);
+ if (forecastList.size() == 0) {
+ List<Area> areaList = areaMapper.getAreaByCityCode(code);
+ for (Area area1 : areaList) {
+ parameters.put("cityCode", area1.getAreaCode());
+ forecastList = forecastWeatherMapper.getForecast(parameters);
+ if (forecastList.size() != 0) {
+ break;
+ }
+ }
+ }
+ }
List<Map<String, Object>> foreList = new ArrayList<>();
-
- for (Map<String, Object> map : forecastList) {
+ for (Map<String, Object> forecastMap : forecastList) {
Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("time", map.get("time").toString());
+ hashMap.put("time", forecastMap.get("time").toString());
hashMap.put("type", "������");
- hashMap.put("city", parameters.get("city").toString());
- Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(map.get("json").toString());
+ hashMap.put("TVOC", "");
+ hashMap.put("altitude", "");
+ hashMap.put("vegetation", "");
+ hashMap.put("AQI", "");
+ hashMap.put("SO2C", "");
+ hashMap.put("NO2C", "");
+ hashMap.put("COC", "");
+ hashMap.put("O3C", "");
+ hashMap.put("PM25C", "");
+ hashMap.put("PM10C", "");
+ hashMap.put("city", parameters.get("name").toString());
+ if (sdf.parse(time).getTime() <= now.getTime()) {
+ hashMap.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));
+ } else if (now.getTime() > date1.getTime() && (now.getTime() < date2.getTime() || now.getTime() == date2.getTime())) {
+ hashMap.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) {
+ String ftime = foreMap.get("time").toString();
+ Date endTime = sdf1.parse(ftime);
+ cal.setTime(endTime);
+ cal.add(Calendar.HOUR, -6);
+ Date startTime = cal.getTime();
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("start", startTime);
+ hashMap.put("end", endTime);
+ hashMap.put("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));
+ Map<String, Object> precip6HourMap = forecastWeatherMapper.getPrecip6Hour(hashMap);
+ foreMap.put("precip6", "");
+ if (precip6HourMap != null) {
+ foreMap.put("precip6", precip6HourMap.get("precip6").toString());
+ }
+ }
+
List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqi(parameters);
if (aqiList.size() == 0) {
- parameters.put("areaCode", cityCode);
+ parameters.put("areaCode", parentCode);
aqiList = hangzhouAqiMapper.getAqi(parameters);
}
@@ -326,26 +400,53 @@
hashMap.put("time", aqiMap.get("time"));
Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(aqiMap.get("json").toString());
hashMap.putAll(jsonMap);
- hashMap.put("city", parameters.get("city").toString());
+ hashMap.put("city", parameters.get("name").toString());
realAqilist.add(hashMap);
}
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
for (Map<String, Object> map : realAqilist) {
Date endTime = sdf1.parse(map.get("time").toString());
- c.setTime(endTime);
- c.add(Calendar.HOUR, -8);
- Date startTime = c.getTime();
+ cal.setTime(endTime);
+ cal.add(Calendar.HOUR, -8);
+ Date startTime = cal.getTime();
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("areaCode", Integer.valueOf(parameters.get("areaCode").toString()));
hashMap.put("start", startTime);
hashMap.put("end", endTime);
Map<String, Object> O3Map = hangzhouAqiMapper.getAvgO3EightHours(hashMap);
- map.put("O3������8������", O3Map.get("O3������8������").toString());
- if (O3Map.get("O3������8������") != null) {
- map.put("O3������8������", O3Map.get("O3������8������").toString());
+ map.put("O3_8H", O3Map.get("O3_8H").toString());
+ if (O3Map.get("O3C_8H") != null) {
+ map.put("O3C_8H", O3Map.get("O3C_8H").toString());
}
+ }
+
+ //������
+ String ac = parameters.get("areaCode").toString();
+ Map<String, Object> params = new HashMap<>();
+ if (ac.endsWith("00")) {
+ params.put("cityCode", Integer.valueOf(ac));
+ } else {
+ params.put("areaCode", Integer.valueOf(ac));
+ }
+ List<MonitorPoint> monitorList = monitorPointMapper.getMonitorList(params);
+
+ List<Integer> pointList = new ArrayList<>();
+ for (MonitorPoint point : monitorList) {
+ Integer pointId = point.getId();
+ pointList.add(pointId);
+ }
+
+ List<Device> deviceList = deviceMapper.getDeviceListByMonitorPointIds(pointList);
+ List<String> macList = new ArrayList<>();
+ List<Map<String, Object>> beamList = new ArrayList<>();
+ if (deviceList.size() != 0) {
+ for (Device device : deviceList) {
+ String mac = device.getMac();
+ macList.add(mac);
+ }
+
+ parameters.put("macs", macList);
+ beamList = historyHourlyMapper.getBeamByMacs(parameters);
}
List<Map<String, Object>> realList = realWeatherMapper.getRealWeather(parameters);
@@ -355,8 +456,33 @@
hashMap.put("time", realMap.get("time"));
Map<String, Object> jsonMap = (Map<String, Object>) JSONObject.parse(realMap.get("json").toString());
hashMap.putAll(jsonMap);
- hashMap.put("city", parameters.get("city").toString());
+ hashMap.put("city", parameters.get("name").toString());
realWeatherList.add(hashMap);
+ }
+
+ for (Map<String, Object> realMap : realWeatherList) {
+ String rtime = realMap.get("time").toString();
+ for (Map<String, Object> beamMap : beamList) {
+ String btime = beamMap.get("time").toString();
+ if (btime.equals(rtime)) {
+ realMap.put("beam", Math.floor((Double) beamMap.get("beam")));
+ }
+ }
+
+ Date endTime = sdf1.parse(rtime);
+ cal.setTime(endTime);
+ cal.add(Calendar.HOUR, -6);
+ Date startTime = cal.getTime();
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("cityCode", Integer.valueOf(parameters.get("areaCode").toString()));
+ hashMap.put("start", startTime);
+ hashMap.put("end", endTime);
+
+ Map<String, Object> precip6HourMap = realWeatherMapper.getPrecip6Hour(hashMap);
+
+ if (precip6HourMap != null) {
+ realMap.put("precip6", precip6HourMap.get("precip6").toString());
+ }
}
List<Map<String, Object>> list = new ArrayList<>();
@@ -393,13 +519,15 @@
}
}
}
+
list.removeAll(Collections.singleton(null));
for (Map<String, Object> map : list) {
map.put("type", "������");
- map.put("city", parameters.get("city").toString());
+ map.put("city", parameters.get("name").toString());
}
List<Map<String, Object>> resultList = new ArrayList<>();
+
for (Map<String, Object> foreMap : foreList) {
for (Map<String, Object> realMap : list) {
if (foreMap.get("time").equals(realMap.get("time"))) {
@@ -418,39 +546,85 @@
hashMap.put("city", parameters.get("city").toString());
resultList.add(hashMap);
}
+
+ for (Map<String, Object> map : resultList) {
+ String date = map.get("time").toString().substring(0, 16);
+ map.put("time", date);
+ if (map.get("AQI") != null) {
+ String aqi = map.get("AQI").toString().split("\\.")[0];
+ map.put("AQI", aqi);
+ }
+ if (map.get("precip") != null) {
+ String aqi = map.get("precip").toString();
+ if (aqi.equals("0.0")) {
+ map.put("precip", "");
+ }
+ }
+ if (map.get("precip6") != null) {
+ String aqi = map.get("precip6").toString();
+ if (aqi.equals("0.0")) {
+ map.put("precip6", "");
+ }
+ }
+ }
return resultList;
}
- @Override
- public void updateForecastWeather(List<Map<String, Object>> list) {
- for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("time", time);
- Integer monitorPointId;
- String city = map.get("city").toString();
- Area area = areaMapper.getAreaByName(city);
- if (area == null) {
- Integer cityCode = cityMapper.getCityByName(city).getCityCode();
- monitorPointId = monitorPointMapper.getFirstMonitorPointByCityCode(cityCode).getId();
- } else {
- Integer areaCode = area.getAreaCode();
- monitorPointId = monitorPointMapper.getFirstMonitorPointByAreaCode(areaCode).getId();
- }
- parameters.put("monitorPointId", monitorPointId);
- Map<String, Object> jsonMap = new HashMap<>();
- for (String key : map.keySet()) {
- if (!key.equals("city") && !key.equals("time") && !key.equals("type")) {
- String value = map.get(key).toString();
- jsonMap.put(key, value);
+ @Override
+ public void updateForecastWeather(Map<String, Object> parameters) {
+ List<Integer> list = new ArrayList<>();
+ List<Map<String, Object>> resultList = new ArrayList<>();
+ for (int i = 0; i < 48; i++) {
+ list.add(i);
+ resultList.add(null);
+ }
+ for (Integer s : list) {
+ Map<String, Object> map = new HashMap<>();
+ for (String key : parameters.keySet()) {
+ String replace = key.split("\\[")[0];
+ if (replace.equals(s + "")) {
+ String ss = key.split("\\[")[1].replace("]", "");
+ map.put(ss, parameters.get(key).toString());
}
}
+ resultList.set(s, map);
+ }
+ for (Map<String, Object> map : resultList) {
+ if (map.get("type").equals("������")) {
+ String time = map.get("time").toString() + ":00";
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("time", time);
+ String cityName = map.get("city").toString();
+ Area area = areaMapper.getAreaByName(cityName);
+ if (area == null) {
+ City city = cityMapper.getCityByName(cityName);
+ if (city == null) {
+ Province province = provinceMapper.getProvinceByName(cityName);
+ if (province == null) {
+ return;
+ } else {
+ hashMap.put("cityCode", province.getProvinceCode());
+ }
+ } else {
+ Integer cityCode = city.getCityCode();
+ hashMap.put("cityCode", cityCode);
+ }
+ } else {
+ Integer areaCode = area.getAreaCode();
+ hashMap.put("cityCode", areaCode);
+ }
- String json = JSONObject.toJSONString(jsonMap);
- parameters.put("json", json);
-
- forecastWeatherMapper.updateForecastWeather(parameters);
+ Map<String, Object> jsonMap = new HashMap<>();
+ for (String key : map.keySet()) {
+ if (!key.equals("city") && !key.equals("time") && !key.equals("type") && !key.equals("fxTime")) {
+ String value = map.get(key).toString();
+ jsonMap.put(key, value);
+ }
+ }
+ hashMap.put("json", JSONObject.toJSONString(jsonMap));
+ forecastWeatherMapper.updateForecastWeather(hashMap);
+ }
}
}
}
--
Gitblit v1.8.0