From f5b46438bf9d2ff9900c6db3474d13ddca03ceca Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 18 Aug 2020 15:51:54 +0800
Subject: [PATCH] 更新风级格式
---
src/main/java/com/moral/service/impl/WeatherServiceImpl.java | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/WeatherServiceImpl.java b/src/main/java/com/moral/service/impl/WeatherServiceImpl.java
index 3caa8d3..b24743f 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.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -13,7 +14,6 @@
import javax.annotation.Resource;
-import org.apache.jasper.compiler.JspUtil;
import org.dom4j.Element;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -334,7 +334,8 @@
List<Map<String, Object>> foreList = new ArrayList<>();
for (Map<String, Object> forecastMap : forecastList) {
Map<String, Object> hashMap = new HashMap<>();
- hashMap.put("time", forecastMap.get("time").toString());
+ String ftime = forecastMap.get("time").toString();
+ hashMap.put("time", ftime);
hashMap.put("type", "������");
hashMap.put("TVOC", "");
hashMap.put("altitude", "");
@@ -368,6 +369,7 @@
foreList.add(hashMap);
}
+ //������6���������������
for (Map<String, Object> foreMap : foreList) {
String ftime = foreMap.get("time").toString();
Date endTime = sdf1.parse(ftime);
@@ -385,10 +387,26 @@
}
}
+ //������O3C_8H
+ for (Map<String, Object> map : foreList) {
+ Date endTime = sdf1.parse(map.get("time").toString());
+ cal.setTime(endTime);
+ cal.add(Calendar.HOUR, -8);
+ Date startTime = cal.getTime();
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));
+ hashMap.put("start", startTime);
+ hashMap.put("end", endTime);
+ Map<String, Object> O3Map = forecastWeatherMapper.getO38Hours(hashMap);
+ if (O3Map != null) {
+ map.put("O3C_8H", O3Map.get("O3C_8H").toString());
+ }
+ }
+
String ac = parameters.get("cityCode").toString();
List<Map<String, Object>> aqiList = hangzhouAqiMapper.getAqi(parameters);
if (aqiList.size() == 0) {
- parameters.put("cityCode", code);//320500
+ parameters.put("cityCode", code);
aqiList = hangzhouAqiMapper.getAqi(parameters);
if (aqiList.size() == 0) {
List<Area> areaList = areaMapper.getAreaByCityCode(code);
@@ -408,12 +426,19 @@
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(".####");
+ double longitude = Double.valueOf(jsonMap.get("longitude").toString());
+ double latitude = Double.valueOf(jsonMap.get("latitude").toString());
+ jsonMap.put("longitude", df.format(longitude));
+ jsonMap.put("latitude", df.format(latitude));
hashMap.putAll(jsonMap);
hashMap.put("city", parameters.get("name").toString());
realAqilist.add(hashMap);
}
+
for (Map<String, Object> map : realAqilist) {
- Date endTime = sdf1.parse(map.get("time").toString());
+ String rtime = map.get("time").toString();
+ Date endTime = sdf1.parse(rtime);
cal.setTime(endTime);
cal.add(Calendar.HOUR, -8);
Date startTime = cal.getTime();
@@ -425,7 +450,6 @@
map.put("O3C_8H", O3Map.get("O3C_8H").toString());
}
//������
-
Map<String, Object> params = new HashMap<>();
if (ac.endsWith("00")) {
params.put("cityCode", Integer.valueOf(ac));
@@ -611,7 +635,49 @@
if ((!map.containsKey("PM10C")) && map.containsKey("PM10")) {
map.put("PM10C", map.get("PM10").toString());
}
+ if (map.get("windScale") != null) {
+ String windScale = map.get("windScale").toString().replace("-", "~");
+ map.put("windScale",windScale);
+ }
+ }
+ //���4���������������
+ double value = 160.0 * 8;
+ int nowHour = Integer.valueOf(sdf1.format(now).substring(11, 13));
+ String format = sdf1.format(now).substring(0, 13) + ":00:00";
+ if (nowHour < 8) {
+ return resultList;
+ }
+ for (Map<String, Object> resultMap : resultList) {
+ if (resultMap.get("type").equals("������")) {
+ String rtime = resultMap.get("time").toString() + ":00";
+ int rhour = Integer.valueOf(rtime.substring(11, 13));
+ cal.setTime(sdf1.parse(rtime));
+ cal.add(Calendar.HOUR_OF_DAY, -7);
+ Date startTime = cal.getTime();
+ Date endTime = sdf1.parse(format);
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("cityCode", Integer.valueOf(parameters.get("cityCode").toString()));
+ hashMap.put("start", startTime);
+ hashMap.put("end", endTime);
+ 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", 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", 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", v);
+ }
+ }
}
return resultList;
}
--
Gitblit v1.8.0