From 6cb2181e215ee168554d37b1b13a9938356bc5f9 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 22 Nov 2023 13:32:22 +0800
Subject: [PATCH] fix：测试提交
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 1522d56..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
@@ -59,18 +59,21 @@
//������������������aqi������������
QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
wrapper.select("city_code", "time", "value")
- .ge("time", DateUtils.dateToDateString(start))
- .lt("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()));
- CityAqiDaily cityAqiDaily = new CityAqiDaily();
+ List<CityAqiDaily> cityAqiDailies = new ArrayList<>();
+
data.forEach((cityCode, value) -> {
+ CityAqiDaily cityAqiDaily = new CityAqiDaily();
Map<String, Object> jsonMap = new HashMap<>();
cityAqiDaily.setCityCode(Integer.parseInt(cityCode));
cityAqiDaily.setTime(start);
@@ -83,7 +86,7 @@
}
sensors.forEach(sensor -> {
- OptionalDouble optionalDouble = value.parallelStream().flatMapToDouble(v -> {
+ OptionalDouble optionalDouble = value.stream().flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
Object sensorValue = dataValue.get(sensor);
if (ObjectUtils.isEmpty(sensorValue)) {
@@ -122,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