From 5b830047d8db717372f32b9b475cc0b57ef186de Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 08 Nov 2021 11:21:07 +0800
Subject: [PATCH] city_aqi月年统计定时任务
---
screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java | 34 +++++++++++++++++++++++++++++++++-
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 5 ++---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 15 +++------------
3 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
index fcde6f6..24a9006 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
@@ -48,7 +48,8 @@
@Override
public void insertCityAqiDaily() {
- List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2", "CO", "O3", "AQI");
+ //���������������������������
+ List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2", "CO");
String format = DateUtils.yyyy_MM_dd_EN;
Date now = new Date();
//���������������������
@@ -80,7 +81,7 @@
//������������������������0������������O3������������������������������1���-8���
value.removeIf(map -> ((Date) map.get("time")).getTime() == start.getTime());
- //���������������������������������������
+ //O3���������������������������������������
Double o3OfDay = AmendUtils.o3OfDay(value);
if (o3OfDay != null) {
jsonMap.put("O3", o3OfDay);
@@ -92,16 +93,6 @@
sensors.forEach(sensor -> {
OptionalDouble optionalDouble = tempValue.parallelStream().flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
- //������������������
- if ("O3".equals(sensor)) {
- return null;
- }
-
- //aqi������������
- if ("AQI".equals(sensor)) {
- return null;
- }
-
Object sensorValue = dataValue.get(sensor);
if (ObjectUtils.isEmpty(sensorValue)) {
return null;
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..b393684 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
@@ -137,9 +137,8 @@
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);
diff --git a/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java b/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
index 3ed2628..5032f23 100644
--- a/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
@@ -4,7 +4,9 @@
import org.springframework.stereotype.Component;
import com.moral.api.service.CityAqiDailyService;
+import com.moral.api.service.CityAqiMonthlyService;
import com.moral.api.service.CityAqiService;
+import com.moral.api.service.CityAqiYearlyService;
import com.moral.api.service.HistoryAqiService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.context.XxlJobHelper;
@@ -21,6 +23,12 @@
@Autowired
private CityAqiService cityAqiService;
+
+ @Autowired
+ private CityAqiMonthlyService cityAqiMonthlyService;
+
+ @Autowired
+ private CityAqiYearlyService cityAqiYearlyService;
//���������aqi������������������
@XxlJob("insertHistoryAqi")
@@ -48,7 +56,7 @@
//������aqi���������������
@XxlJob("insertCityAqiDaily")
- public ReturnT insertCityAqiDaily(){
+ public ReturnT insertCityAqiDaily() {
try {
cityAqiDailyService.insertCityAqiDaily();
} catch (Exception e) {
@@ -57,4 +65,28 @@
}
return ReturnT.SUCCESS;
}
+
+ //������aqi���������������
+ @XxlJob("insertCityAqiMonthly")
+ public ReturnT insertCityAqiMonthly() {
+ try {
+ cityAqiMonthlyService.insertCityAqiMonthly();
+ } catch (Exception e) {
+ XxlJobHelper.log(e.getMessage());
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
+
+ //������aqi���������������
+ @XxlJob("insertCityAqiYearly")
+ public ReturnT insertCityAqiYearly() {
+ try {
+ cityAqiYearlyService.insertCityAqiYearly();
+ } catch (Exception e) {
+ XxlJobHelper.log(e.getMessage());
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
+ }
+ return ReturnT.SUCCESS;
+ }
}
--
Gitblit v1.8.0