From adde1ed1a99622c80a95dea83e294711d295c55c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 08 Sep 2020 14:46:43 +0800
Subject: [PATCH] 微型站5分钟与半小时数据
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 121 +++++++++++++++++++++++++++++++--------
1 files changed, 95 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index fb15d94..171dd63 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.service.impl;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -9,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;
@@ -38,6 +41,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 +77,9 @@
@Resource
private HistoryHourlyMapper historyHourlyMapper;
+
+ @Resource
+ private ShAreaMapper shAreaMapper;
@Override
public Map<String, Object> getWeatherDataByRegion(Map<String, Object> parameters) {
@@ -278,10 +285,13 @@
@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 = 0;
- String name = "";
+ Integer code;
+ String name;
if (area == null) {
City city = cityMapper.getCityByName(cityName);
if (city == null) {
@@ -302,6 +312,7 @@
String time = parameters.get("time").toString();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH");
Date now = new Date();
Date selectTime = sdf1.parse(time + " 01:00:00");
Calendar cal = Calendar.getInstance();
@@ -309,13 +320,13 @@
cal.add(Calendar.DAY_OF_MONTH, 1);
Date end = cal.getTime();
cal.setTime(sdf.parse(time));
- Date time1 = cal.getTime();
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) {
@@ -406,6 +417,9 @@
}
String ac = parameters.get("cityCode").toString();
+ if(name.equals("���������")){
+ ac="130900";
+ }
List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqi(parameters);
if (aqiList.size() == 0) {
parameters.put("cityCode", code);
@@ -423,20 +437,12 @@
}
}
}
+ DecimalFormat df = 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());
- DecimalFormat df = new DecimalFormat(".####");
- if (jsonMap.get("longitude") != null) {
- double longitude = Double.valueOf(jsonMap.get("longitude").toString());
- jsonMap.put("longitude", df.format(longitude));
- }
- if (jsonMap.get("latitude") != null) {
- double longitude = Double.valueOf(jsonMap.get("latitude").toString());
- jsonMap.put("latitude", df.format(longitude));
- }
hashMap.putAll(jsonMap);
hashMap.put("city", parameters.get("name").toString());
realAqilist.add(hashMap);
@@ -454,14 +460,6 @@
hashMap.put("end", endTime);
Map<String, Object> O3Map = hangzhouAqiMapper.getAvgO3EightHours(hashMap);
map.put("O3C_8H", O3Map.get("O3C_8H").toString());
- /*Double O3C_8H = Double.valueOf(O3Map.get("O3C_8H").toString());
- map.put("O3C_8H", String.valueOf(Math.round(O3C_8H)));
- Double PM25 = Double.valueOf(map.get("PM2_5").toString());
- map.put("PM2_5", String.valueOf(Math.round(PM25)));
- Double PM10 = Double.valueOf(map.get("PM10").toString());
- map.put("PM10", String.valueOf(Math.round(PM10)));
- Double O3 = Double.valueOf(map.get("O3").toString());
- map.put("O3", String.valueOf(Math.round(O3)));*/
}
//������
Map<String, Object> params = new HashMap<>();
@@ -470,8 +468,8 @@
} else {
params.put("areaCode", Integer.valueOf(ac));
}
- List<MonitorPoint> monitorList = monitorPointMapper.getMonitorList(params);
+ List<MonitorPoint> monitorList = monitorPointMapper.getMonitorList(params);
List<Integer> pointList = new ArrayList<>();
for (MonitorPoint point : monitorList) {
Integer pointId = point.getId();
@@ -486,7 +484,6 @@
for (Device device : deviceList) {
macList.add(device.getMac());
}
-
parameters.put("macs", macList);
beamList = historyHourlyMapper.getBeamByMacs(parameters);
Map<String, Object> map = new HashMap<>();
@@ -545,7 +542,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);
}
}
@@ -593,6 +593,16 @@
}
List<Map<String, Object>> resultList = new ArrayList<>();
+
+ if (foreList.size() == 0) {
+ for (Map<String, Object> map : realWeatherList) {
+ Map<String,Object> hashMap=new LinkedHashMap<>();
+ hashMap.put("time",map.get("time").toString());
+ hashMap.put("type","������");
+ hashMap.put("city",map.get("city").toString());
+ foreList.add(hashMap);
+ }
+ }
for (Map<String, Object> foreMap : foreList) {
for (Map<String, Object> realMap : list) {
@@ -658,13 +668,22 @@
//���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()) {
+ 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));
@@ -675,6 +694,10 @@
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());
@@ -682,14 +705,14 @@
} 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)));
+ 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);
+ double v = (value - Double.valueOf(sumO3Map.get("O3Sum").toString())) / 4;
resultMap.put("goodValue", String.valueOf(Math.round(v)));
}
}
@@ -712,6 +735,24 @@
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;
@@ -754,4 +795,32 @@
}
}
}
+
+ @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;
+ String name;
+ if (area == null) {
+ City city = cityMapper.getCityByName(cityName);
+ if (city == null) {
+ Province province = provinceMapper.getProvinceByName(cityName);
+ code = province.getProvinceCode();
+ name = province.getProvinceName();
+ } else {
+ code = city.getCityCode();
+ name = city.getCityName();
+ }
+ } else {
+ code = area.getAreaCode();
+ name = area.getAreaName();
+ }
+
+ parameters.put("cityCode", code);
+ parameters.put("name", name);
+ return null;
+ }
+
}
--
Gitblit v1.8.0