From 4a50bd93dfcdedb85f117d25f89e67291eb65cf7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 14 Oct 2023 10:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 49 ++++++++++++++++++-------------------------------
1 files changed, 18 insertions(+), 31 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..b98b8fc 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();
//���������������������
@@ -58,50 +59,35 @@
//������������������aqi������������
QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
wrapper.select("city_code", "time", "value")
- .ge("time", DateUtils.dateToDateString(start))
- .le("time", DateUtils.dateToDateString(end));
+ .ge("time", start)
+ .lt("time", 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;
@@ -139,7 +125,8 @@
jsonMap.put("compositeIndex", compositeIndex);
cityAqiDaily.setValue(JSONObject.toJSONString(jsonMap));
- cityAqiDailyMapper.insert(cityAqiDaily);
+ cityAqiDailies.add(cityAqiDaily);
});
+ cityAqiDailyMapper.insertCityAqiDaily(cityAqiDailies);
}
}
--
Gitblit v1.8.0