From 0bb98d4377e5b894a2338b7726846b978450e187 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Jan 2022 10:31:33 +0800
Subject: [PATCH] update
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 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 10664c8..15cc9f4 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,11 +3,11 @@
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;
@@ -23,6 +23,7 @@
import org.springframework.util.ObjectUtils;
import org.springframework.web.client.RestTemplate;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -45,7 +46,7 @@
private CityAqiMapper cityAqiMapper;
@Autowired
- private CityConfigService cityConfigService;
+ private CityConfigAqiService cityConfigAqiService;
@Autowired
private RestTemplate restTemplate;
@@ -55,25 +56,30 @@
@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) == 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();
+ List<CityAqi> cityAqiList = new ArrayList<>();
+
+ for (CityConfigAqi cityConfigAqi : list) {
+ CityAqi cityAqi = new CityAqi();
+ 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;
}
@@ -106,11 +112,11 @@
.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());
return DoubleStream.of(o3);
@@ -137,17 +143,24 @@
sixParamMap.put(Constants.SENSOR_CODE_CO, aqi.get("CO"));
sixParamMap.put(Constants.SENSOR_CODE_O3, aqi.get("O3"));
AQI aqiAndPollutant = AQIUtils.hourlyAQI(sixParamMap);
- if (!ObjectUtils.isEmpty(aqiAndPollutant.getPrimaryPollutantNames())) {
- aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames());
- }
+ 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);
+ cityAqiList.add(cityAqi);
//������redis
redisTemplate.opsForHash().put(RedisConstants.CITY_AQI, cityCode.toString(), aqi);
}
+ cityAqiMapper.insertCityAqi(cityAqiList);
+ }
+
+ @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