From c35090abedcfd1c9a8d53794570e836f2b0bb866 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Feb 2022 15:25:43 +0800
Subject: [PATCH] 督办单编号唯一性
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 64 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 35 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 28a0fc0..5ec2a3e 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
@@ -8,6 +8,7 @@
import com.moral.api.service.CityAqiDailyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.CityAqiService;
+import com.moral.constant.Constants;
import com.moral.pojo.AQI;
import com.moral.util.AQIUtils;
import com.moral.util.AmendUtils;
@@ -47,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();
//���������������������
@@ -58,49 +60,34 @@
QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
wrapper.select("city_code", "time", "value")
.ge("time", DateUtils.dateToDateString(start))
- .le("time", DateUtils.dateToDateString(end));
+ .lt("time", DateUtils.dateToDateString(end));
List<Map<String, Object>> dailyData = cityAqiService.listMaps(wrapper);
if (dailyData.size() == 0) {
return;
}
//���city_code������
- Map<String, List<Map<String, Object>>> data = dailyData.parallelStream().collect(Collectors.groupingBy(o -> o.get("city_code").toString()));
+ Map<String, List<Map<String, Object>>> data = dailyData.stream()
+ .collect(Collectors.groupingBy(o -> o.get("city_code").toString()));
+
+ List<CityAqiDaily> cityAqiDailies = new ArrayList<>();
data.forEach((cityCode, value) -> {
- Map<String, Object> jsonMap = new HashMap<>();
CityAqiDaily cityAqiDaily = new CityAqiDaily();
+ Map<String, Object> jsonMap = new HashMap<>();
cityAqiDaily.setCityCode(Integer.parseInt(cityCode));
cityAqiDaily.setTime(start);
-
- //���������������������������������������������������
- List<Map<String, Object>> tempValue = new ArrayList<>(value);
-
- //������������������������0������������O3������������������������������1���-8���
- value.removeIf(map -> ((Date) map.get("time")).getTime() == start.getTime());
-
- //���������������������������������������
- Double o3OfDay = AmendUtils.o3OfDay(value);
- if (o3OfDay != null) {
- jsonMap.put("O3", o3OfDay);
+ //O3���������������������������������������
+ if (!ObjectUtils.isEmpty(value)) {
+ Double o3OfDay = AmendUtils.o3OfDay(value);
+ if (o3OfDay != null) {
+ jsonMap.put("O3", o3OfDay);
+ }
}
- //������������������������������������
- tempValue.removeIf(o -> ((Date) o.get("time")).getTime() == end.getTime());
-
sensors.forEach(sensor -> {
- OptionalDouble optionalDouble = tempValue.parallelStream().flatMapToDouble(v -> {
+ OptionalDouble optionalDouble = value.stream().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;
@@ -120,19 +107,26 @@
}
});
- //���aqi������
- AQI aqi = AQIUtils.dailyAQI(jsonMap);
+ //���aqi,���������������������
+ Map<String, Object> sixParamMap = new HashMap<>();
+ sixParamMap.put(Constants.SENSOR_CODE_PM25, jsonMap.get("PM2_5"));
+ sixParamMap.put(Constants.SENSOR_CODE_PM10, jsonMap.get("PM10"));
+ sixParamMap.put(Constants.SENSOR_CODE_SO2, jsonMap.get("SO2"));
+ sixParamMap.put(Constants.SENSOR_CODE_NO2, jsonMap.get("NO2"));
+ sixParamMap.put(Constants.SENSOR_CODE_CO, jsonMap.get("CO"));
+ sixParamMap.put(Constants.SENSOR_CODE_O3, jsonMap.get("O3"));
+
+ AQI aqi = AQIUtils.dailyAQI(sixParamMap);
jsonMap.put("AQI", aqi.getAQIValue());
+ jsonMap.put("primaryPollutant", aqi.getPrimaryPollutantNames());
//���������������������
Double compositeIndex = ComprehensiveIndexUtils.dailyData(jsonMap);
jsonMap.put("compositeIndex", compositeIndex);
- //���������������������
- jsonMap.put("primaryPollutant", aqi.getPrimaryPollutantNames());
-
cityAqiDaily.setValue(JSONObject.toJSONString(jsonMap));
- cityAqiDailyMapper.insert(cityAqiDaily);
+ cityAqiDailies.add(cityAqiDaily);
});
+ cityAqiDailyMapper.insertCityAqiDaily(cityAqiDailies);
}
}
--
Gitblit v1.8.0