From 8a4fccc993cbef14b83443d91e51e9b74664eab5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 10 Aug 2020 11:18:46 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 262 +++++++++++++++++++++++++++++-----------------------
1 files changed, 146 insertions(+), 116 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 5720be2..106f60d 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -176,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";
@@ -187,17 +188,17 @@
String nextDay = sdf.format(c.getTime());
parameters.put("start", sdf.parse(time));
parameters.put("end", sdf.parse(nextDay));
- 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);
+ 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);
+
if (aqiList.size() == 0) {
- parameters.put("areaCode", monitorPoint.getCityCode());
+ parameters.put("cityCode", monitorPoint.getCityCode());
aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
}
for (Map<String, Object> map : aqiList) {
@@ -218,7 +219,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);
}
@@ -257,7 +258,7 @@
}
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);
@@ -275,59 +276,64 @@
@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 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();
+ 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();
+ name = area.getAreaName();
}
- if (monitorPoint == null) {
- return new ArrayList<>();
- }
- parameters.put("monitorPointId", monitorPoint.getId());
+
+ parameters.put("cityCode", code);
+ parameters.put("name", name);
String time = parameters.get("time").toString();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date now = new Date();
- Date selectTime = sdf1.parse(time + " 00:00:00");
- Calendar c1 = Calendar.getInstance();
- c1.setTime(selectTime);
- c1.add(Calendar.DAY_OF_MONTH, -1);
- Date beforeDay = c1.getTime();
- String format = sdf.format(beforeDay);
- 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);
+ 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);
+ 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();
+ forecastList = forecastWeatherMapper.getForecast(parameters);
+ if (forecastList.size() != 0) {
+ break;
+ }
+ }
+ }
+ }else {
+ fcode= Integer.valueOf(parameters.get("cityCode").toString());
+ }
+
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("TVOC", "");
hashMap.put("altitude", "");
@@ -339,83 +345,89 @@
hashMap.put("O3C", "");
hashMap.put("PM25C", "");
hashMap.put("PM10C", "");
- hashMap.put("city", parameters.get("city").toString());
-
- if (selectTime.getTime() <= now.getTime()) {
- hashMap.put("fxTime", (format + " 15:00").substring(5, 16));
+ hashMap.put("city", parameters.get("name").toString());
+ hashMap.put("code",fcode);
+ if (sdf.parse(time).getTime() <= now.getTime()) {
+ hashMap.put("fxTime", (beforeDay + " 15:00").substring(5, 16));
} else {
- String s = sdf1.format(now).split(" ")[1].split(":")[0];
- Integer hour = Integer.valueOf(s);
- if (hour > 15) {
- hashMap.put("fxTime", (format + " 15:00").substring(5, 16));
- } else if (hour > 7 && hour < 15) {
- hashMap.put("fxTime", (format + " 07:00").substring(5, 16));
+ 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(map.get("json").toString());
+ 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();
- Calendar calendar = Calendar.getInstance();
Date endTime = sdf1.parse(ftime);
- calendar.setTime(endTime);
- calendar.add(Calendar.HOUR, -6);
- Date startTime = calendar.getTime();
+ cal.setTime(endTime);
+ cal.add(Calendar.HOUR, -6);
+ 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);
- hashMap.put("monitorPointId", Integer.valueOf(parameters.get("monitorPointId").toString()));
+ 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());
}
}
+ String ac = parameters.get("cityCode").toString();
List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqi(parameters);
if (aqiList.size() == 0) {
- parameters.put("areaCode", cityCode);
+ parameters.put("cityCode", code);//320500
aqiList = hangzhouAqiMapper.getAqi(parameters);
+ if (aqiList.size() == 0) {
+ List<Area> areaList = areaMapper.getAreaByCityCode(code);
+ for (Area area1 : areaList) {
+ if (area1 != null) {
+ parameters.put("cityCode", area1.getAreaCode());
+ aqiList = hangzhouAqiMapper.getAqi(parameters);
+ if (aqiList.size() != 0) {
+ break;
+ }
+ }
+ }
+ }
}
-
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());
hashMap.putAll(jsonMap);
- hashMap.put("city", parameters.get("city").toString());
+ hashMap.put("city", parameters.get("name").toString());
realAqilist.add(hashMap);
}
-
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("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));
hashMap.put("start", startTime);
hashMap.put("end", endTime);
Map<String, Object> O3Map = hangzhouAqiMapper.getAvgO3EightHours(hashMap);
- map.put("O3_8H", O3Map.get("O3_8H").toString());
- if (O3Map.get("O3C_8H") != null) {
- map.put("O3C_8H", O3Map.get("O3C_8H").toString());
- }
+ map.put("O3C_8H", O3Map.get("O3C_8H").toString());
}
-
//������
- String code = parameters.get("areaCode").toString();
- Map<String, Object> params = new HashMap<>();
- if (code.endsWith("00")) {
- params.put("cityCode", Integer.valueOf(code));
- } else {
- params.put("areaCode", Integer.valueOf(code));
- }
+ 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<>();
@@ -423,7 +435,6 @@
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<>();
@@ -437,7 +448,6 @@
beamList = historyHourlyMapper.getBeamByMacs(parameters);
}
-
List<Map<String, Object>> realList = realWeatherMapper.getRealWeather(parameters);
List<Map<String, Object>> realWeatherList = new ArrayList<>();
for (Map<String, Object> realMap : realList) {
@@ -445,7 +455,7 @@
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);
}
@@ -454,21 +464,24 @@
for (Map<String, Object> beamMap : beamList) {
String btime = beamMap.get("time").toString();
if (btime.equals(rtime)) {
- realMap.put("beam", beamMap.get("beam").toString());
+ realMap.put("beam", Math.floor((Double) beamMap.get("beam")));
}
}
- Calendar calendar = Calendar.getInstance();
+
Date endTime = sdf1.parse(rtime);
- calendar.setTime(endTime);
- calendar.add(Calendar.HOUR, -6);
- Date startTime = calendar.getTime();
+ cal.setTime(endTime);
+ cal.add(Calendar.HOUR, -6);
+ Date startTime = cal.getTime();
Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("areaCode", Integer.valueOf(parameters.get("areaCode").toString()));
+ hashMap.put("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));
hashMap.put("start", startTime);
hashMap.put("end", endTime);
- hashMap.put("monitorPointId", Integer.valueOf(parameters.get("monitorPointId").toString()));
+
Map<String, Object> precip6HourMap = realWeatherMapper.getPrecip6Hour(hashMap);
- realMap.put("precip6", precip6HourMap.get("precip6").toString());
+
+ if (precip6HourMap != null) {
+ realMap.put("precip6", precip6HourMap.get("precip6").toString());
+ }
}
List<Map<String, Object>> list = new ArrayList<>();
@@ -506,13 +519,10 @@
}
}
-
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<>();
@@ -539,9 +549,45 @@
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", "");
+ }
+ }
+ if ((!map.containsKey("SO2C")) && map.containsKey("SO2")) {
+ map.put("SO2C", map.get("SO2").toString());
+ }
+ if ((!map.containsKey("NO2C")) && map.containsKey("NO2")) {
+ map.put("SO2C", map.get("SO2").toString());
+ }
+ if ((!map.containsKey("O3C")) && map.containsKey("O3")) {
+ map.put("O3C", map.get("O3").toString());
+ }
+ 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("PM10C")) && map.containsKey("PM10")) {
+ map.put("PM10C", map.get("PM10").toString());
+ }
+
}
return resultList;
}
+
@Override
public void updateForecastWeather(Map<String, Object> parameters) {
@@ -567,18 +613,7 @@
String time = map.get("time").toString() + ":00";
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("time", time);
- String city = map.get("city").toString();
- Area area = areaMapper.getAreaByName(city);
- Map<String, Object> idMap = new HashMap<>();
- if (area == null) {
- Integer cityCode = cityMapper.getCityByName(city).getCityCode();
- idMap.put("cityCode", cityCode);
- } else {
- Integer areaCode = area.getAreaCode();
- idMap.put("areaCode", areaCode);
- }
-
- List<MonitorPoint> monitorList = monitorPointMapper.getMonitorList(idMap);
+ 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")) {
@@ -586,13 +621,8 @@
jsonMap.put(key, value);
}
}
-
- String json = JSONObject.toJSONString(jsonMap);
- hashMap.put("json", json);
- for (MonitorPoint monitorPoint : monitorList) {
- hashMap.put("monitorPointId", monitorPoint.getId());
- forecastWeatherMapper.updateForecastWeather(hashMap);
- }
+ hashMap.put("json", JSONObject.toJSONString(jsonMap));
+ forecastWeatherMapper.updateForecastWeather(hashMap);
}
}
}
--
Gitblit v1.8.0