From e3e9b168cbd9a60858843c622a3859896aefe5fb Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 07 Sep 2020 10:40:00 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 4c7881a..3df2b4f 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,6 +10,7 @@
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -38,6 +40,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 +76,9 @@
@Resource
private HistoryHourlyMapper historyHourlyMapper;
+
+ @Resource
+ private ShAreaMapper shAreaMapper;
@Override
public Map<String, Object> getWeatherDataByRegion(Map<String, Object> parameters) {
@@ -278,10 +284,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 +311,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 +319,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) {
@@ -423,20 +433,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);
@@ -478,7 +480,6 @@
for (Device device : deviceList) {
macList.add(device.getMac());
}
-
parameters.put("macs", macList);
beamList = historyHourlyMapper.getBeamByMacs(parameters);
Map<String, Object> map = new HashMap<>();
@@ -537,7 +538,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);
}
}
@@ -585,6 +589,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) {
@@ -650,10 +664,19 @@
//���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()) {
@@ -667,6 +690,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());
@@ -707,16 +734,21 @@
}
}
+ //������������
+ Map<String, Object> point = shAreaMapper.getgeography(name);
for (Map<String, Object> map : resultList) {
- if (map.get("type").equals("������")) {
- if (resultList.get(1).get("longitude") != null) {
- String longitude = resultList.get(1).get("longitude").toString();
- map.put("longitude",longitude);
- }
- if (resultList.get(1).get("latitude") != null) {
- String latitude = resultList.get(1).get("latitude").toString();
- map.put("latitude",latitude);
- }
+ 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;
@@ -759,4 +791,5 @@
}
}
}
+
}
--
Gitblit v1.8.0