From 8dbbc6981e91231455273ae25bd8b25bef534a0d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 25 Aug 2020 15:25:56 +0800
Subject: [PATCH] 根据城市获取数据增加海拔，植被，水系
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 7599438..072c542 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;
@@ -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) {
@@ -423,20 +428,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 +475,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 +533,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);
}
}
@@ -656,7 +655,7 @@
}
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));
@@ -667,6 +666,9 @@
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());
@@ -674,7 +676,7 @@
} 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;
@@ -706,6 +708,17 @@
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));
+ map.put("altitude",point.get("altitude").toString());
+ map.put("vegetation",point.get("vegetation").toString());
+ map.put("river",point.get("river").toString());
+ }
return resultList;
}
--
Gitblit v1.8.0