From 85dba01ea5021d83487c3ed2d60706f516a0774b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 05 Jan 2022 14:40:28 +0800
Subject: [PATCH] 贡献率数据格式修改
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 53 insertions(+), 34 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 9b31a27..141b779 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
@@ -3,13 +3,14 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.CityAqi;
-import com.moral.api.entity.CityConfig;
+import com.moral.api.entity.CityConfigAqi;
import com.moral.api.mapper.CityAqiMapper;
import com.moral.api.service.CityAqiService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.moral.api.service.CityConfigService;
+import com.moral.api.service.CityConfigAqiService;
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;
@@ -44,7 +45,7 @@
private CityAqiMapper cityAqiMapper;
@Autowired
- private CityConfigService cityConfigService;
+ private CityConfigAqiService cityConfigAqiService;
@Autowired
private RestTemplate restTemplate;
@@ -52,31 +53,30 @@
@Autowired
private RedisTemplate redisTemplate;
- @Autowired
-
-
@Override
public void insertCityAqi() {
+ //pubtime=08���������������07-08������������������������������������������������07���
Date now = new Date();
Date time = DateUtils.dataToTimeStampTime(now, DateUtils.yyyy_MM_dd_HH_EN);
- String format = DateUtils.yyyy_MM_dd_EN;
-
+ //������������������time������������������
+ Date dataTime = DateUtils.addHours(time, -1);
Date start = null;
- if (DateUtils.getHour(time) == 0 || DateUtils.getHour(time) >= 8) {
- start = DateUtils.addHours(time, -7);
+ if (DateUtils.getHour(time) >= 8 || DateUtils.getHour(time) == 0) {
+ start = DateUtils.addHours(time, -8);
}
//������������������
- QueryWrapper<CityConfig> wrapper = new QueryWrapper<>();
+ QueryWrapper<CityConfigAqi> wrapper = new QueryWrapper<>();
wrapper.select("city_code", "city_id").eq("is_delete", Constants.NOT_DELETE);
- List<CityConfig> list = cityConfigService.list(wrapper);
+ List<CityConfigAqi> list = cityConfigAqiService.list(wrapper);
- for (CityConfig cityConfig : list) {
- Integer cityCode = cityConfig.getCityCode();
+ CityAqi cityAqi = new CityAqi();
+ for (CityConfigAqi cityConfigAqi : list) {
+ Integer cityCode = cityConfigAqi.getCityCode();
Map<String, Object> data;
try {
//������������������������������
- data = restTemplate.getForObject("http://sapi.7drlb.com/api/mj?cityID={1}&apiKey=aqi", Map.class, cityConfig.getCityId());
+ data = restTemplate.getForObject("http://sapi.7drlb.com/api/mj?cityID={1}&apiKey=aqi", Map.class, cityConfigAqi.getCityId());
} catch (Exception e) {
continue;
}
@@ -86,14 +86,20 @@
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) {
@@ -103,41 +109,54 @@
.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("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 -> {
+ OptionalDouble average = cityAqis.stream().flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
- double o3 = Double.parseDouble(dataValue.get("o3").toString());
+ 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);
+ 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"));
+ 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);
- }
+ 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 List<CityAqi> getCityAqi() {
+ String time = DateUtils.getDateStringOfHour(-1, DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
+ QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("time", time);
+ return cityAqiMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.8.0