From c97552b69c0af01aadc2580a59a46f58d5545985 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Sep 2020 15:06:00 +0800
Subject: [PATCH] B/S登陆以及测试接口上传
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 482 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 271 insertions(+), 211 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 7125594..4010f85 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -10,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;
@@ -203,10 +205,20 @@
List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
List<Map<String, Object>> forecastList = forecastWeatherMapper.getForecastHour(parameters);
- if (aqiList.size() == 0) {
- parameters.put("cityCode", monitorPoint.getCityCode());
- aqiList = hangzhouAqiMapper.getAqiDataByAreaCode(parameters);
+ String timeUnits=time.substring(5,7);
+ if(aqiList.size() == 0){
+ 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) {
String O3 = map.get("O3").toString().replace("\"", "");
map.put("O3", O3);
@@ -281,8 +293,46 @@
}
@Override
- public List<Map<String, Object>> getWeatherData(Map<String, Object> parameters) throws ParseException {
- parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");
+ 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);
Integer code;
@@ -304,6 +354,39 @@
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>>();
+ }
+ 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 time = parameters.get("time").toString();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -318,45 +401,22 @@
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;
- }
- }
+ if (!String.valueOf(code).endsWith("0000")) {
+ parameters.put("cityCode", parentCode);
+ forecastList = forecastWeatherMapper.getForecast(parameters);
}
- } else {
- fcode = Integer.valueOf(parameters.get("cityCode").toString());
}
+ //���������������������������07,15���������������
List<Map<String, Object>> foreList = new ArrayList<>();
for (Map<String, Object> forecastMap : forecastList) {
Map<String, Object> hashMap = new HashMap<>();
- String ftime = forecastMap.get("time").toString();
- hashMap.put("time", ftime);
+ hashMap.put("time", forecastMap.get("time").toString());
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", "");
- 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("city", name);
if (sdf.parse(time).getTime() <= now.getTime()) {
hashMap.put("fxTime", (beforeDay + " 15:00").substring(5, 16));
} else {
@@ -365,7 +425,7 @@
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())) {
+ } else if (now.getTime() > date1.getTime()) {
hashMap.put("fxTime", (beforeDay + " 07:00").substring(5, 16));
}
}
@@ -374,171 +434,201 @@
foreList.add(hashMap);
}
- //������6���������������
for (Map<String, Object> foreMap : foreList) {
- String ftime = foreMap.get("time").toString();
- Date endTime = sdf1.parse(ftime);
+ 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();
- 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());
}
- }
-
- //������O3C_8H
- for (Map<String, Object> map : foreList) {
- Date endTime = sdf1.parse(map.get("time").toString());
+ //������8������O3���������(������)
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()));
+ startTime = cal.getTime();
hashMap.put("start", startTime);
- hashMap.put("end", endTime);
Map<String, Object> O3Map = forecastWeatherMapper.getO38Hours(hashMap);
if (O3Map != null) {
- Double O3C_8H = Double.valueOf(O3Map.get("O3C_8H").toString());
- map.put("O3C_8H", String.valueOf(Math.round(O3C_8H)));
+ foreMap.put("O3C_8H", O3Map.get("O3_8H").toString());
}
}
-
- String ac = parameters.get("cityCode").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("cityCode", code);
- 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) {
- 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;
- }
- }
+ 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("name").toString());
+ hashMap.put("city", name);
realAqilist.add(hashMap);
}
+ //������o3_8H(������)
for (Map<String, Object> map : realAqilist) {
- String rtime = map.get("time").toString();
- Date endTime = sdf1.parse(rtime);
+ 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("cityCode", Integer.valueOf(parameters.get("cityCode").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("O3C_8H", O3Map.get("O3C_8H").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 (ac.endsWith("00")) {
- params.put("cityCode", Integer.valueOf(ac));
+ 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", Integer.valueOf(ac));
+ params.put("areaCode", code);
}
- 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<String> macList1 = new ArrayList<>();
+ 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 (deviceList.size() != 0) {
- for (Device device : deviceList) {
- macList.add(device.getMac());
- }
- parameters.put("macs", macList);
+ if (macs.size() != 0) {
+ parameters.put("macs", macs);
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);
+ tvocList = historyHourlyMapper.getTVOCByMacs(parameters);
}
+
+ //������������
+ int x = 0;
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 = new HashMap<>();
+ 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("name").toString());
+ hashMap.put("city", name);
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")));
+ if (beamMap.get("time").equals(rtime)) {
+ realMap.put("beam", beamMap.get("beam").toString());
}
}
-
+ //TVOC
+ for (Map<String, Object> tvocMap : tvocList) {
+ if (tvocMap.get("time").equals(rtime)) {
+ realMap.put("TVOC", tvocMap.get("TVOC").toString());
+ }
+ }
+ //������6���������������(������)
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("cityCode").toString()));
+ hashMap.put("cityCode", code);
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());
}
-
- for (Map<String, Object> tvocMap : tvocList) {
- String ttime = tvocMap.get("time").toString();
- if (ttime.equals(rtime)) {
- Double tvoc = Double.valueOf(tvocMap.get("TVOC").toString());
- BigDecimal bd = new BigDecimal(tvoc);
- tvoc = bd.setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
- realMap.put("TVOC", tvoc);
- }
- }
-
}
List<Map<String, Object>> list = new ArrayList<>();
@@ -575,14 +665,26 @@
}
}
}
-
list.removeAll(Collections.singleton(null));
for (Map<String, Object> map : list) {
map.put("type", "������");
- map.put("city", parameters.get("name").toString());
+ map.put("city", name);
}
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) {
@@ -598,60 +700,74 @@
Map<String, Object> hashMap = new HashMap<>();
hashMap.put("time", map.get("time").toString());
hashMap.put("type", "������");
- hashMap.put("city", parameters.get("name").toString());
+ hashMap.put("city", name);
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")) {
+ if ("0.0".equals(map.get("precip"))) {
map.put("precip", "");
}
}
if (map.get("precip6") != null) {
- String aqi = map.get("precip6").toString();
- if (aqi.equals("0.0")) {
+ if ("0.0".equals(map.get("precip6"))) {
map.put("precip6", "");
}
}
if ((!map.containsKey("SO2C")) && map.containsKey("SO2")) {
- map.put("SO2C", map.get("SO2").toString());
+ 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());
+ 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());
+ 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.put("PM25C", map.get("PM2_5").toString());
+ map.put("PM25C", map.get("PM2_5").toString().replace("\\.", ""));
+ map.remove("PM2_5");
}
if ((!map.containsKey("PM10C")) && map.containsKey("PM10")) {
- map.put("PM10C", map.get("PM10").toString());
+ 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()) {
@@ -668,6 +784,7 @@
if (rhour == 0) {
rhour = 24;
}
+
if (rhour == nowHour) {
Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString());
@@ -687,82 +804,25 @@
}
}
}
- if (resultMap.get("O3C_8H") != null && !resultMap.get("O3C_8H").equals("")) {
- Double O3C_8H = Double.valueOf(resultMap.get("O3C_8H").toString());
- resultMap.put("O3C_8H", String.valueOf(Math.round(O3C_8H)));
- }
-
- if (resultMap.get("PM25C") != null && !resultMap.get("PM25C").equals("")) {
- Double PM25C = Double.valueOf(resultMap.get("PM25C").toString());
- resultMap.put("PM25C", String.valueOf(Math.round(PM25C)));
- }
-
- if (resultMap.get("PM10C") != null && !resultMap.get("PM10C").equals("")) {
- Double PM10C = Double.valueOf(resultMap.get("PM10C").toString());
- resultMap.put("PM10C", String.valueOf(Math.round(PM10C)));
- }
-
- if (resultMap.get("O3C") != null && !resultMap.get("O3C").equals("")) {
- Double O3C = Double.valueOf(resultMap.get("O3C").toString());
- resultMap.put("O3C", String.valueOf(Math.round(O3C)));
- }
}
//������������
- Map<String, Object> point = shAreaMapper.getgeography(name);
+ Map<String, Object> geographyMap = shAreaMapper.getGeography(name);
for (Map<String, Object> map : resultList) {
- double longitude = Double.valueOf(point.get("lng").toString());
- double latitude = Double.valueOf(point.get("lat").toString());
+ double longitude = Double.valueOf(geographyMap.get("lng").toString());
+ double latitude = Double.valueOf(geographyMap.get("lat").toString());
map.put("longitude", df.format(longitude));
map.put("latitude", df.format(latitude));
- if (point.get("altitude") != null) {
- map.put("altitude", point.get("altitude").toString());
+ if (geographyMap.get("altitude") != null) {
+ map.put("altitude", geographyMap.get("altitude").toString());
}
- if (point.get("vegetation") != null) {
- map.put("vegetation", point.get("vegetation").toString());
+ if (geographyMap.get("vegetation") != null) {
+ map.put("vegetation", geographyMap.get("vegetation").toString());
}
- if (point.get("river") != null) {
- map.put("river", point.get("river").toString());
+ if (geographyMap.get("river") != null) {
+ map.put("river", geographyMap.get("river").toString());
}
}
return resultList;
- }
-
- @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);
- 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);
- }
- }
}
}
--
Gitblit v1.8.0