From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 661 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 536 insertions(+), 125 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..0991b8c 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -1,5 +1,7 @@
package com.moral.service.impl;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -8,11 +10,13 @@
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
+import org.apache.jasper.compiler.JspUtil;
import org.dom4j.Element;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -24,16 +28,20 @@
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;
+import com.moral.mapper.ShAreaMapper;
import com.moral.service.OrganizationService;
import com.moral.service.WeatherService;
@@ -63,6 +71,15 @@
@Resource
private RealWeatherMapper realWeatherMapper;
+
+ @Resource
+ private DeviceMapper deviceMapper;
+
+ @Resource
+ private HistoryHourlyMapper historyHourlyMapper;
+
+ @Resource
+ private ShAreaMapper shAreaMapper;
@Override
public Map<String, Object> getWeatherDataByRegion(Map<String, Object> parameters) {
@@ -167,6 +184,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,19 +196,27 @@
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));
+ 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);
+ String timeUnits = time.substring(5, 7);
if (aqiList.size() == 0) {
- parameters.put("areaCode", monitorPoint.getCityCode());
- aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
+ parameters.put("timeUnits", timeUnits);
+ aqiList = hangzhouAqiMapper.getHistoryO3(parameters);
+ if (aqiList.size() == 0) {
+ parameters.put("cityCode", monitorPoint.getCityCode());
+ aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
+ if (aqiList.size() == 0) {
+ parameters.put("cityCode", monitorPoint.getAreaCode());
+ aqiList = hangzhouAqiMapper.getHistoryO3(parameters);
+ }
+ }
}
for (Map<String, Object> map : aqiList) {
@@ -211,7 +237,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 +251,11 @@
hour = "24";
}
map.put("time", Integer.valueOf(hour));
- values.add(forecastMap.get("result").toString().replace("\"", ""));
+ if (forecastMap.get("O3") != null) {
+ values.add(forecastMap.get("O3").toString().replace("\"", ""));
+ } else {
+ values.add("");
+ }
values.add("");
map.put("values", values);
resultList.add(map);
@@ -239,10 +269,14 @@
hour = "24";
}
map.put("time", Integer.valueOf(hour));
- values.add(forecastMap.get("result").toString().replace("\"", ""));
+ if (forecastMap.get("O3") != null) {
+ values.add(forecastMap.get("O3").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);
@@ -259,147 +293,404 @@
}
@Override
- public List<Map<String, Object>> getWeatherData(Map<String, Object> parameters) throws ParseException {
+ 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);
+ 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") && !key.equals("code")) {
+ String value = map.get(key).toString();
+ jsonMap.put(key, value);
+ }
+ }
+ hashMap.put("json", JSONObject.toJSONString(jsonMap));
+ forecastWeatherMapper.updateForecastWeather(hashMap);
+ }
+ }
+ }
+
+ @Override
+ public List<Map<String, Object>> getWeatherDataByDay(Map<String, Object> parameters) throws ParseException {
+ String selectTime = parameters.get("time").toString();
String cityName = parameters.get("city").toString();
Area area = areaMapper.getAreaByName(cityName);
- MonitorPoint monitorPoint;
- Integer areaCode = 0;
- Integer cityCode = 0;
+ Integer code;
+ 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("cityCode", code);
+ parameters.put("name", name);
+ return null;
+ }
+
+ @Override
+ public List<Map<String, Object>> getWeatherData(Map<String, Object> parameters) throws ParseException {
+ parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");
+ if (parameters.get("city") == null) {
+ return new ArrayList<Map<String, Object>>();
}
- parameters.put("monitorPointId", monitorPoint.getId());
- String time = parameters.get("time").toString();
+ String cityName = parameters.get("city").toString();
+ Area area = areaMapper.getAreaByName(cityName);
+ Integer code;
+ String name;
+ Integer parentCode;
+ if (area == null) {
+ City city = cityMapper.getCityByName(cityName);
+ if (city == null) {
+ Province province = provinceMapper.getProvinceByName(cityName);
+ code = province.getProvinceCode();
+ name = province.getProvinceName();
+ parentCode = 0;
+ } else {
+ code = city.getCityCode();
+ name = city.getCityName();
+ parentCode = city.getProvinceCode();
+ }
+ } else {
+ code = area.getAreaCode();
+ name = area.getAreaName();
+ parentCode = area.getCityCode();
+ }
+ parameters.put("cityCode", code);
+ parameters.put("name", name);
+ String string = parameters.get("time").toString();
+ String year = string.substring(0, 4);
+ String[] split = string.substring(5).split("-");
+ String month = split[0];
+ String day = split[1];
+ if (split[0].length() < 2) {
+ month = 0 + split[0];
+ }
+ if (split[1].length() < 2) {
+ day = 0 + split[1];
+ }
+ String time = year + "-" + month + "-" + day;
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);
- List<Map<String, Object>> foreList = new ArrayList<>();
+ if (forecastList.size() == 0) {
+ if (!String.valueOf(code).endsWith("0000")) {
+ parameters.put("cityCode", parentCode);
+ forecastList = forecastWeatherMapper.getForecast(parameters);
+ }
+ }
- for (Map<String, Object> map : forecastList) {
+ //���������������������������07,15���������������
+ List<Map<String, Object>> foreList = new ArrayList<>();
+ 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("city", name);
+ 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()) {
+ 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) {
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("cityCode", parameters.get("cityCode").toString());
+ Date endTime = sdf1.parse(foreMap.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());
+ }
+ //������8������O3���������(������)
+ cal.setTime(endTime);
+ cal.add(Calendar.HOUR, -8);
+ startTime = cal.getTime();
+ hashMap.put("start", startTime);
+ Map<String, Object> O3Map = forecastWeatherMapper.getO38Hours(hashMap);
+ if (O3Map != null) {
+ foreMap.put("O3C_8H", O3Map.get("O3_8H").toString());
+ }
+ }
+ //������������aqi
+ parameters.put("cityCode", code);
+ //���hangzhou_aqi���������������������history_aqi_���������������
+ int p = 0;
+ String timeUnits1 = time.substring(5, 7);
+ String timeUnits2 = sdf1.format(end).substring(5, 7);
List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqi(parameters);
if (aqiList.size() == 0) {
- parameters.put("areaCode", cityCode);
- aqiList = hangzhouAqiMapper.getAqi(parameters);
+ p = 1;
+ //1-23���������������������������������������������������������������������
+ parameters.put("timeUnits", timeUnits1);
+ List<Map<String, Object>> aqiList1 = hangzhouAqiMapper.getHistoryAqi(parameters);
+ parameters.put("timeUnits", timeUnits2);
+ List<Map<String, Object>> aqiList2 = hangzhouAqiMapper.getHistoryAqi(parameters);
+ aqiList.addAll(aqiList1);
+ aqiList.addAll(aqiList2);
+ //���������������������������
+ if (aqiList.size() == 0) {
+ p = 0;
+ parameters.put("cityCode", parentCode);
+ aqiList = hangzhouAqiMapper.getAqi(parameters);
+ if (aqiList.size() == 0) {
+ p = 1;
+ parameters.put("timeUnits", timeUnits1);
+ aqiList1 = hangzhouAqiMapper.getHistoryAqi(parameters);
+ parameters.put("timeUnits", timeUnits2);
+ aqiList2 = hangzhouAqiMapper.getHistoryAqi(parameters);
+ aqiList.addAll(aqiList1);
+ aqiList.addAll(aqiList2);
+ }
+ }
}
-
+ 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());
+ 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)) {
+ long v = Math.round(Double.valueOf(jsonMap.get(key).toString()));
+ jsonMap.put(key, String.valueOf(v));
+ } else if ("COC".equals(key) || "CO".equals(key)) {
+ String CO = df1.format(Double.valueOf(jsonMap.get(key).toString()));
+ jsonMap.put(key, CO);
+ } else if ("AQI".equals(key)) {
+ long AQI = Math.round(Double.valueOf(jsonMap.get(key).toString()));
+ jsonMap.put(key, String.valueOf(AQI));
+ }
+
+ }
hashMap.putAll(jsonMap);
- hashMap.put("city", parameters.get("city").toString());
+ hashMap.put("city", name);
realAqilist.add(hashMap);
}
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
+ //������o3_8H(������)
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();
+ String s = map.get("time").toString();
+ Date endTime = sdf1.parse(s);
+ 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", parameters.get("cityCode").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<String, Object> O3Map = new HashMap<>();
+ if (p == 0) {
+ O3Map = hangzhouAqiMapper.getAvgO3EightHours(hashMap);
+ } else {
+ hashMap.put("time", endTime);
+ hashMap.put("timeUnits", s.substring(5, 7));
+ O3Map = hangzhouAqiMapper.getHistoryO3EightHours(hashMap);
}
+ map.put("O3C_8H", O3Map.get("O3_8H").toString().replace("\"", ""));
+ }
+ //������������������������������������������������������tvoc
+ Map<String, Object> params = new HashMap<>();
+ if (String.valueOf(code).endsWith("0000")) {
+ params.put("provinceCode", code);
+ } else if (String.valueOf(code).endsWith("00")) {
+ params.put("cityCode", code);
+ } else {
+ params.put("areaCode", code);
+ }
+ List<Integer> monitorPointIds = monitorPointMapper.getMonitorPointIds(params);
+ List<String> macs = deviceMapper.getMacsByMonitorPointIds(monitorPointIds);
+ List<Map<String, Object>> beamList = new ArrayList<>();
+ List<Map<String, Object>> tvocList = new ArrayList<>();
+ if (macs.size() != 0) {
+ parameters.put("macs", macs);
+ beamList = historyHourlyMapper.getBeamByMacs(parameters);
+ tvocList = historyHourlyMapper.getTVOCByMacs(parameters);
}
+ //������������
+ int x = 0;
+ parameters.put("cityCode", code);
List<Map<String, Object>> realList = realWeatherMapper.getRealWeather(parameters);
+ if (realList.size() == 0) {
+ //1-23���������������������������������������������������������������������
+ x = 1;
+ timeUnits1 = time.substring(5, 7);
+ timeUnits2 = sdf1.format(end).substring(5, 7);
+ parameters.put("timeUnits", timeUnits1);
+ List<Map<String, Object>> realList1 = realWeatherMapper.getHistoryWeather(parameters);
+ parameters.put("timeUnits", timeUnits2);
+ List<Map<String, Object>> realList2 = realWeatherMapper.getHistoryWeather(parameters);
+ realList.addAll(realList1);
+ realList.addAll(realList2);
+ //���������������������������
+ if (realList.size() == 0) {
+ x = 0;
+ parameters.put("cityCode", parentCode);
+ realList = realWeatherMapper.getRealWeather(parameters);
+ if (realList.size() == 0) {
+ x = 1;
+ parameters.put("timeUnits", timeUnits1);
+ realList1 = realWeatherMapper.getHistoryWeather(parameters);
+ parameters.put("timeUnits", timeUnits2);
+ realList2 = realWeatherMapper.getHistoryWeather(parameters);
+ realList.addAll(realList1);
+ realList.addAll(realList2);
+ }
+ }
+ }
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 = (Map<String, Object>) JSONObject.parse(realMap.get("json").toString());
+ Map<String, Object> jsonMap;
+ if (x == 0) {
+ jsonMap = (Map<String, Object>) JSONObject.parse(realMap.get("json").toString());
+ } else {
+ jsonMap = (Map<String, Object>) JSONObject.parse(realMap.get("value").toString());
+ }
hashMap.putAll(jsonMap);
- hashMap.put("city", parameters.get("city").toString());
+ hashMap.put("city", name);
realWeatherList.add(hashMap);
+ }
+
+ //Tvoc,������������
+ for (Map<String, Object> beamMap : beamList) {
+ for (Map<String, Object> tvocMap : tvocList) {
+ Object bTime = beamMap.get("time");
+ Object Ttime = tvocMap.get("time");
+ if (bTime.equals(Ttime)) {
+ beamMap.putAll(tvocMap);
+ }
+ }
}
List<Map<String, Object>> list = new ArrayList<>();
for (int i = 0; i < 24; i++) {
- list.add(null);
+ Map<String, Object> map = new HashMap<>();
+ String tt = time + " " + (i + 1) + ":00:00";
+ if ((i + 1) < 10) {
+ tt = time + " 0" + (i + 1) + ":00:00";
+ } else if (i == 23) {
+ tt = sdf.format(end) + " 00:00:00";
+ }
+ map.put("time", tt);
+ list.add(map);
}
- for (Map<String, Object> map : realWeatherList) {
- Integer t1 = Integer.valueOf(map.get("time").toString().split(" ")[1].split(":")[0]);
- if (t1 == 0) {
- list.set(list.size() - 1, map);
- } else {
- list.set(t1 - 1, map);
+ for (Map<String, Object> map1 : list) {
+ String time1 = map1.get("time").toString();
+ for (Map<String, Object> map2 : beamList) {
+ if (time1.equals(map2.get("time"))) {
+ map1.putAll(map2);
+ }
+ }
+
+ for (Map<String, Object> realMap : realWeatherList) {
+ if (time1.equals(realMap.get("time"))) {
+ map1.putAll(realMap);
+ }
+ }
+
+ //������6���������������(������)
+ Date endTime = sdf1.parse(time1);
+ cal.setTime(endTime);
+ cal.add(Calendar.HOUR, -6);
+ Date startTime = cal.getTime();
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("cityCode", code);
+ hashMap.put("start", startTime);
+ hashMap.put("end", endTime);
+ Map<String, Object> precip6HourMap = realWeatherMapper.getPrecip6Hour(hashMap);
+ if (precip6HourMap != null) {
+ map1.put("precip6", precip6HourMap.get("precip6").toString());
}
}
- for (Map<String, Object> map : realAqilist) {
- Integer t1 = Integer.valueOf(map.get("time").toString().split(" ")[1].split(":")[0]);
- if (t1 == 0) {
- Map<String, Object> map1 = list.get(list.size() - 1);
- if (map1 == null) {
- list.set(list.size() - 1, map);
- } else {
- map1.putAll(map);
- list.set(list.size() - 1, map1);
- }
- } else {
- Map<String, Object> map1 = list.get(t1 - 1);
- if (map1 == null) {
- list.set(t1 - 1, map);
- } else {
- map1.putAll(map);
- list.set(t1 - 1, map1);
+ for (Map<String, Object> listMap : list) {
+ listMap.put("type", "������");
+ listMap.put("city", name);
+ String time1 = listMap.get("time").toString();
+ for (Map<String, Object> aqiMap : realAqilist) {
+ if (time1.equals(aqiMap.get("time"))) {
+ listMap.putAll(aqiMap);
}
}
- }
- list.removeAll(Collections.singleton(null));
- for (Map<String, Object> map : list) {
- map.put("type", "������");
- map.put("city", parameters.get("city").toString());
}
List<Map<String, Object>> resultList = new ArrayList<>();
+ if (foreList.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),
+ d = cal.getTimeInMillis()) {
+ Map<String, Object> hashMap = new LinkedHashMap<>();
+ hashMap.put("type", "������");
+ hashMap.put("city", name);
+ hashMap.put("time", sdf1.format(d));
+ foreList.add(hashMap);
+ }
+ }
+
for (Map<String, Object> foreMap : foreList) {
for (Map<String, Object> realMap : list) {
if (foreMap.get("time").equals(realMap.get("time"))) {
@@ -408,49 +699,169 @@
}
}
}
-
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", name);
resultList.add(hashMap);
}
- 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);
+ for (Map<String, Object> map : resultList) {
+ String date = map.get("time").toString().substring(0, 16);
+ map.put("time", date);
+ if (map.get("precip") != null) {
+ if ("0.0".equals(map.get("precip"))) {
+ map.put("precip", "");
}
}
-
- String json = JSONObject.toJSONString(jsonMap);
- parameters.put("json", json);
-
- forecastWeatherMapper.updateForecastWeather(parameters);
+ if (map.get("precip6") != null) {
+ if ("0.0".equals(map.get("precip6"))) {
+ map.put("precip6", "");
+ }
+ }
+ if ((!map.containsKey("SO2C")) && map.containsKey("SO2")) {
+ map.put("SO2C", map.get("SO2").toString().replace("\\.", ""));
+ map.remove("SO2");
+ }
+ if ((!map.containsKey("NO2C")) && map.containsKey("NO2")) {
+ map.put("NO2C", map.get("NO2").toString().replace("\\.", ""));
+ map.remove("NO2");
+ }
+ if ((!map.containsKey("O3C")) && map.containsKey("O3")) {
+ map.put("O3C", map.get("O3").toString().replace("\\.", ""));
+ map.remove("O3");
+ }
+ if ((!map.containsKey("COC")) && map.containsKey("CO")) {
+ map.put("COC", map.get("CO").toString());
+ map.remove("CO");
+ }
+ if ((!map.containsKey("PM25C")) && (map.containsKey("PM2_5") || map.containsKey("PM25"))) {
+ if (map.get("PM2_5") != null) {
+ map.put("PM25C", map.get("PM2_5").toString().replace("\\.", ""));
+ map.remove("PM2_5");
+ }
+ if (map.get("PM25") != null) {
+ map.put("PM25C", map.get("PM25").toString().replace("\\.", ""));
+ map.remove("PM25");
+ }
+ }
+ if ((!map.containsKey("PM10C")) && map.containsKey("PM10")) {
+ map.put("PM10C", map.get("PM10").toString().replace("\\.", ""));
+ map.remove("PM10");
+ }
+ if (map.get("windScale") != null) {
+ String windScale = map.get("windScale").toString().replace("-", "~");
+ map.put("windScale", windScale);
+ }
+ //������������
+ if (map.get("temp") != null) {
+ long temp = Math.round(Double.valueOf(map.get("temp").toString()));
+ map.put("temp", String.valueOf(temp));
+ }
}
+
+ //���4���������������
+ double value = 160.0 * 8;
+ int nowHour = Integer.valueOf(sdf1.format(now).substring(11, 13));
+ int nowMinute = Integer.valueOf(sdf1.format(now).substring(14, 16));
+ String format = sdf1.format(now).substring(0, 13) + ":00:00";
+ if (nowHour < 8) {
+ return resultList;
+ }
+
+ if (nowMinute >= 46) {
+ nowHour = nowHour + 1;
+ cal.setTime(now);
+ cal.add(Calendar.HOUR_OF_DAY, 1);
+ format = sdf1.format(cal.getTime()).substring(0, 13) + ":00:00";
+ }
+
+ for (Map<String, Object> resultMap : resultList) {
+ if (resultMap.get("type").equals("������")) {
+ 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 == 0) {
+ rhour = 24;
+ }
+
+ if (rhour == nowHour) {
+ Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
+ if (sumO3Map != null) {
+ 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);
+ if (sumO3Map != null) {
+ 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);
+ if (sumO3Map != null) {
+ 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);
+ if (sumO3Map != null) {
+ double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 4;
+ resultMap.put("goodValue", String.valueOf(Math.round(v)));
+ }
+ }
+ }
+ }
+ }
+
+ //������������
+ Map<String, Object> geographyMap = shAreaMapper.getGeography(name);
+ if (geographyMap != null) {
+ for (Map<String, Object> map : resultList) {
+ if (geographyMap.get("lng") != null) {
+ double longitude = Double.valueOf(geographyMap.get("lng").toString());
+ map.put("longitude", df.format(longitude));
+ }
+ if (geographyMap.get("lat") != null) {
+ double latitude = Double.valueOf(geographyMap.get("lat").toString());
+ map.put("latitude", df.format(latitude));
+ }
+ if (geographyMap.get("altitude") != null) {
+ map.put("altitude", geographyMap.get("altitude").toString());
+ }
+ if (geographyMap.get("vegetation") != null) {
+ map.put("vegetation", geographyMap.get("vegetation").toString());
+ }
+ if (geographyMap.get("river") != null) {
+ map.put("river", geographyMap.get("river").toString());
+ }
+ }
+ }
+
+ for (int i = 0; i < resultList.size(); i = i + 2) {
+ Map<String, Object> foreMap = resultList.get(i);
+ Map<String, Object> realMap = resultList.get(i + 1);
+ if (foreMap.get("O3C") != null && realMap.get("O3C") != null) {
+ Double foreO3 = Double.valueOf(foreMap.get("O3C").toString());
+ Double realO3 = Double.valueOf(realMap.get("O3C").toString());
+ int round = (int) Math.round((realO3 - foreO3) / realO3 * 100);
+ if (round < 0) {
+ round = -round;
+ }
+ realMap.put("errorRate", round + "%");
+ }
+ }
+ return resultList;
}
}
--
Gitblit v1.8.0