From 9d91dc402f279630eaa100024fd3b1542fbeb41c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 22 Dec 2021 11:04:41 +0800
Subject: [PATCH] 分钟，5分钟，小时表存入非本月数据bug修复
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 120 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 83 insertions(+), 37 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 310246f..a9c5c9b 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
@@ -9,18 +9,26 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.CityConfigService;
import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
+import com.moral.pojo.AQI;
+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;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
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>
@@ -42,15 +50,28 @@
@Autowired
private RestTemplate restTemplate;
+ @Autowired
+ private RedisTemplate redisTemplate;
+
@Override
public void insertCityAqi() {
+ //pubtime=08���������������07-08������������������������������������������������07���
+ Date now = new Date();
+ Date time = DateUtils.dataToTimeStampTime(now, DateUtils.yyyy_MM_dd_HH_EN);
+ //������������������time������������������
+ Date dataTime = DateUtils.addHours(time, -1);
+ Date start = null;
+ if (DateUtils.getHour(time) >= 8) {
+ start = DateUtils.addHours(time, -8);
+ }
+
//������������������
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 {
//������������������������������
@@ -64,45 +85,70 @@
Map<String, Object> map = (Map<String, Object>) data.get("data");
Map<String, Object> aqi = (Map<String, Object>) map.get("aqi");
- aqi.put("pm2_5", aqi.remove("pm25C"));
aqi.remove("pm25");
- aqi.put("pm10", aqi.remove("pm10C"));
- aqi.put("so2", aqi.remove("so2C"));
- aqi.put("no2", aqi.remove("no2C"));
- aqi.put("co", aqi.remove("coC"));
- aqi.put("o3", aqi.remove("o3c"));
- aqi.put("aqi", aqi.remove("value"));
+ aqi.remove("pm10");
+ aqi.remove("so2");
+ aqi.remove("no2");
+ aqi.remove("co");
+ aqi.remove("o3");
+
+ aqi.put("PM2_5", aqi.remove("pm25C"));
+ aqi.put("PM10", aqi.remove("pm10C"));
+ aqi.put("SO2", aqi.remove("so2C"));
+ aqi.put("NO2", aqi.remove("no2C"));
+ 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(dataTime, 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> sixParamMap = new HashMap<>();
+ sixParamMap.put(Constants.SENSOR_CODE_PM25, aqi.get("PM2_5"));
+ sixParamMap.put(Constants.SENSOR_CODE_PM10, aqi.get("PM10"));
+ sixParamMap.put(Constants.SENSOR_CODE_SO2, aqi.get("SO2"));
+ sixParamMap.put(Constants.SENSOR_CODE_NO2, aqi.get("NO2"));
+ sixParamMap.put(Constants.SENSOR_CODE_CO, aqi.get("CO"));
+ sixParamMap.put(Constants.SENSOR_CODE_O3, aqi.get("O3"));
+ AQI aqiAndPollutant = AQIUtils.hourlyAQI(sixParamMap);
+ aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames());
+
+
CityAqi cityAqi = new CityAqi();
cityAqi.setCityCode(cityCode);
- cityAqi.setTime(time);
+ cityAqi.setTime(dataTime);
cityAqi.setValue(JSONObject.toJSONString(aqi));
cityAqiMapper.insert(cityAqi);
+ //������redis
+ 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