From 9485a0cb33bb4535bb553a5bf49debeadbe0c89d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Nov 2021 11:48:55 +0800
Subject: [PATCH] city_aqi o3_8h，综指，首要污染物计算
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 58 insertions(+), 29 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index 40921a6..9b31a27 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -10,6 +10,9 @@
import com.moral.api.service.CityConfigService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
+import com.moral.util.AQIUtils;
+import com.moral.util.AmendUtils;
+import com.moral.util.ComprehensiveIndexUtils;
import com.moral.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,9 +23,11 @@
import org.springframework.web.client.RestTemplate;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.OptionalDouble;
+import java.util.stream.DoubleStream;
/**
* <p>
@@ -47,15 +52,27 @@
@Autowired
private RedisTemplate redisTemplate;
+ @Autowired
+
+
@Override
public void insertCityAqi() {
+ Date now = new Date();
+ Date time = DateUtils.dataToTimeStampTime(now, DateUtils.yyyy_MM_dd_HH_EN);
+ String format = DateUtils.yyyy_MM_dd_EN;
+
+ Date start = null;
+ if (DateUtils.getHour(time) == 0 || DateUtils.getHour(time) >= 8) {
+ start = DateUtils.addHours(time, -7);
+ }
+
//������������������
QueryWrapper<CityConfig> wrapper = new QueryWrapper<>();
wrapper.select("city_code", "city_id").eq("is_delete", Constants.NOT_DELETE);
List<CityConfig> list = cityConfigService.list(wrapper);
- Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
+
for (CityConfig cityConfig : list) {
- String cityCode = cityConfig.getCityCode();
+ Integer cityCode = cityConfig.getCityCode();
Map<String, Object> data;
try {
//������������������������������
@@ -77,38 +94,50 @@
aqi.put("co", aqi.remove("coC"));
aqi.put("o3", aqi.remove("o3C"));
aqi.put("aqi", aqi.remove("value"));
+
+ //o3���������������
+ if (start != null) {
+ QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("time", "value")
+ .eq("city_code", cityCode)
+ .ge("time", DateUtils.dateToDateString(start));
+ List<Map<String, Object>> cityAqis = cityAqiMapper.selectMaps(queryWrapper);
+ Map<String, Object> params = new HashMap<>();
+ params.put("time", DateUtils.dateToDateString(time,DateUtils.yyyy_MM_dd_HH_mm_ss_S_EN));
+ params.put("value", JSONObject.toJSONString(aqi));
+ cityAqis.add(params);
+ if (cityAqis.size() >= 6) {
+ OptionalDouble average = cityAqis.parallelStream().flatMapToDouble(v -> {
+ Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
+ double o3 = Double.parseDouble(dataValue.get("o3").toString());
+ return DoubleStream.of(o3);
+ }).average();
+ if (average.isPresent()) {
+ double o3_8h = AmendUtils.sciCal(average.getAsDouble(), 0);
+ aqi.put("o3_8h", o3_8h);
+ }
+ }
+ }
+
+ //������������������
+ Map<String, Object> temp = new HashMap<>(aqi);
+ temp.put("o3", temp.get("o3_8h"));
+ Double compositeIndex = ComprehensiveIndexUtils.dailyData(temp);
+ aqi.put("compositeIndex", compositeIndex);
+
+ //���������������������
+ Map<String, Object> pollutant = AQIUtils.cityAqiPollutant(aqi);
+ if (!ObjectUtils.isEmpty(pollutant)) {
+ aqi.putAll(pollutant);
+ }
+
CityAqi cityAqi = new CityAqi();
cityAqi.setCityCode(cityCode);
cityAqi.setTime(time);
cityAqi.setValue(JSONObject.toJSONString(aqi));
cityAqiMapper.insert(cityAqi);
//������redis
- redisTemplate.opsForHash().put(RedisConstants.CITY_AQI, cityCode, aqi);
+ redisTemplate.opsForHash().put(RedisConstants.CITY_AQI, cityCode.toString(), aqi);
}
- }
-
- @Override
- public void insertCityAqiDaily() {
- String format = DateUtils.yyyy_MM_dd_EN;
- Date now = new Date();
- //���������������������
- Date start = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), format);
- //���������������������
- Date end = DateUtils.dataToTimeStampTime(now, format);
- //������������������aqi������������
- QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
- wrapper.select("city_code", "value")
- .ge("time", DateUtils.dateToDateString(start))
- .lt("time", DateUtils.dateToDateString(end));
- List<Map<String, Object>> dailyData = cityAqiMapper.selectMaps(wrapper);
-
- if (dailyData.size() == 0) {
- return;
- }
- //���city_code������
- Map<String, List<Map<String, Object>>> data = dailyData.parallelStream().collect(Collectors.groupingBy(o -> (String) o.get("city_code")));
- data.forEach((cityCode, value) -> {
- });
-
}
}
--
Gitblit v1.8.0