From 417962341a00e4f166a36ea4d1dff4d034d8f762 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 Aug 2020 14:08:00 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 151 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 132 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 7687544..7125594 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;
@@ -13,7 +15,6 @@
import javax.annotation.Resource;
-import org.apache.jasper.compiler.JspUtil;
import org.dom4j.Element;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -38,6 +39,7 @@
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;
@@ -73,6 +75,9 @@
@Resource
private HistoryHourlyMapper historyHourlyMapper;
+
+ @Resource
+ private ShAreaMapper shAreaMapper;
@Override
public Map<String, Object> getWeatherDataByRegion(Map<String, Object> parameters) {
@@ -234,8 +239,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("");
}
@@ -252,8 +257,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("");
}
@@ -280,8 +285,8 @@
parameters.put("typeFormat", "%Y-%m-%d %H:%i:%s");
String cityName = parameters.get("city").toString();
Area area = areaMapper.getAreaByName(cityName);
- Integer code = 0;
- String name = "";
+ Integer code;
+ String name;
if (area == null) {
City city = cityMapper.getCityByName(cityName);
if (city == null) {
@@ -334,7 +339,8 @@
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", "");
@@ -344,7 +350,9 @@
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());
@@ -366,6 +374,7 @@
foreList.add(hashMap);
}
+ //������6���������������
for (Map<String, Object> foreMap : foreList) {
String ftime = foreMap.get("time").toString();
Date endTime = sdf1.parse(ftime);
@@ -383,10 +392,27 @@
}
}
+ //������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) {
+ Double O3C_8H = Double.valueOf(O3Map.get("O3C_8H").toString());
+ map.put("O3C_8H", String.valueOf(Math.round(O3C_8H)));
+ }
+ }
+
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);
@@ -401,6 +427,7 @@
}
}
}
+ DecimalFormat df = new DecimalFormat(".####");
List<Map<String, Object>> realAqilist = new ArrayList<>();
for (Map<String, Object> aqiMap : aqiList) {
Map<String, Object> hashMap = new HashMap<>();
@@ -410,8 +437,10 @@
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();
@@ -423,7 +452,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));
@@ -441,17 +469,16 @@
List<String> macList = new ArrayList<>();
List<String> macList1 = new ArrayList<>();
List<Map<String, Object>> beamList = new ArrayList<>();
- List<Map<String, Object>> tvocList=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);
beamList = historyHourlyMapper.getBeamByMacs(parameters);
Map<String, Object> map = new HashMap<>();
if (name.equals("���������")) {
- List<Integer> list=new ArrayList<>();
+ List<Integer> list = new ArrayList<>();
list.add(48);
List<Device> pointIds = deviceMapper.getDeviceListByMonitorPointIds(list);
for (Device device : pointIds) {
@@ -459,8 +486,8 @@
macList1.add(device.getMac());
}
}
- }else {
- macList1=macList;
+ } else {
+ macList1 = macList;
}
map.put("macs", macList1);
map.put("start", parameters.get("start"));
@@ -505,7 +532,10 @@
for (Map<String, Object> tvocMap : tvocList) {
String ttime = tvocMap.get("time").toString();
if (ttime.equals(rtime)) {
- realMap.put("TVOC", tvocMap.get("TVOC").toString());
+ 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);
}
}
@@ -609,11 +639,94 @@
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("������")) {
+ 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);
+ 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", String.valueOf(Math.round(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", String.valueOf(Math.round(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", String.valueOf(Math.round(v)));
+ }
+ }
+ }
+ 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);
+ for (Map<String, Object> map : resultList) {
+ double longitude = Double.valueOf(point.get("lng").toString());
+ double latitude = Double.valueOf(point.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 (point.get("vegetation") != null) {
+ map.put("vegetation", point.get("vegetation").toString());
+ }
+ if (point.get("river") != null) {
+ map.put("river", point.get("river").toString());
+ }
}
return resultList;
}
-
@Override
public void updateForecastWeather(Map<String, Object> parameters) {
--
Gitblit v1.8.0