From 0eaefd62a7caa039a4f16e27be279eac5e84da5c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 16 Oct 2023 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 1738813..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,8 +59,8 @@
//������������������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) {
@@ -71,8 +71,9 @@
.collect(Collectors.groupingBy(o -> o.get("city_code").toString()));
List<CityAqiDaily> cityAqiDailies = new ArrayList<>();
- CityAqiDaily cityAqiDaily = new CityAqiDaily();
+
data.forEach((cityCode, value) -> {
+ CityAqiDaily cityAqiDaily = new CityAqiDaily();
Map<String, Object> jsonMap = new HashMap<>();
cityAqiDaily.setCityCode(Integer.parseInt(cityCode));
cityAqiDaily.setTime(start);
--
Gitblit v1.8.0