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 | 112 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 72 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 67ed26c..171dd63 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;
@@ -283,6 +285,9 @@
@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;
@@ -307,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();
@@ -320,6 +326,7 @@
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) {
@@ -410,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);
@@ -458,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();
@@ -584,6 +594,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) {
if (foreMap.get("time").equals(realMap.get("time"))) {
@@ -653,6 +673,14 @@
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()) {
@@ -670,46 +698,23 @@
rhour = 24;
}
- if (nowMinute >= 46) {
- if (rhour == nowHour+1) {
- Map<String, Object> sumO3Map = hangzhouAqiMapper.getSumO3(hashMap);
- double v = value - Double.valueOf(sumO3Map.get("O3Sum").toString());
- resultMap.put("goodValue", v);
- } else if (rhour == nowHour + 2) {
- 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 + 3) {
- 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 + 4) {
- 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)));
- }
- }else {
- 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 (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("")) {
@@ -791,4 +796,31 @@
}
}
+ @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