From c3e1f9b9af29647bd157f2ea268bc56b2d3b9df1 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 31 Aug 2020 14:47:46 +0800
Subject: [PATCH] 风场图update
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 072c542..667a819 100644
--- a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
@@ -285,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) {
@@ -314,7 +314,6 @@
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);
@@ -535,7 +534,7 @@
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();
+ tvoc = bd.setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
realMap.put("TVOC", tvoc);
}
}
@@ -649,10 +648,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()) {
@@ -669,6 +677,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());
@@ -709,15 +718,22 @@
}
}
+ //������������
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));
- map.put("altitude",point.get("altitude").toString());
- map.put("vegetation",point.get("vegetation").toString());
- map.put("river",point.get("river").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 +775,5 @@
}
}
}
+
}
--
Gitblit v1.8.0