From fdbef2a3293e536be6b119e4e1e67cc8cc9842f0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Apr 2022 08:55:29 +0800
Subject: [PATCH] 空气质量排名报告
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiYearlyServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiYearlyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiYearlyServiceImpl.java
index 245369d..92736ee 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiYearlyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiYearlyServiceImpl.java
@@ -77,8 +77,8 @@
//������������������aqi���������
QueryWrapper<CityAqiDaily> 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>> monthlyData = cityAqiDailyService.listMaps(wrapper);
if (monthlyData.size() == 0) {
@@ -91,11 +91,14 @@
//������������
QueryWrapper<CityAqiYearly> queryWrapper = new QueryWrapper<>();
queryWrapper.select("city_code", "value")
- .eq("time", DateUtils.dateToDateString(lastLastYear));
+ .eq("time", lastLastYear);
//������������������
- List<CityAqiYearly> lastCityAqiYearly = cityAqiYearlyMapper.selectList(queryWrapper);
- Map<Integer, List<CityAqiYearly>> lastYearData = lastCityAqiYearly.stream()
- .collect(Collectors.groupingBy(CityAqiYearly::getCityCode));
+ List<CityAqiYearly> lastCityAqiYearlyList = cityAqiYearlyMapper.selectList(queryWrapper);
+ Map<Integer, CityAqiYearly> lastYearData = new HashMap<>();
+ for (CityAqiYearly cityAqiYearly : lastCityAqiYearlyList) {
+ lastYearData.put(cityAqiYearly.getCityCode(), cityAqiYearly);
+ }
+
List<CityAqiYearly> cityAqiYearlyList = new ArrayList<>();
@@ -135,10 +138,9 @@
jsonMap.put("compositeIndex", compositeIndex);
//���������������������������
- List<CityAqiYearly> cityAqiYearlies = lastYearData.get(Integer.parseInt(cityCode));
- if (!ObjectUtils.isEmpty(cityAqiYearlies)) {
- CityAqiYearly yearly = cityAqiYearlies.get(0);
- Map<String, Object> map = JSONObject.parseObject(yearly.getValue(), Map.class);
+ CityAqiYearly lastCityAqiYearly = lastYearData.get(Integer.parseInt(cityCode));
+ if (lastCityAqiYearly != null) {
+ Map<String, Object> map = JSONObject.parseObject(lastCityAqiYearly.getValue(), Map.class);
double lastCompositeIndex = Double.parseDouble(map.get("compositeIndex").toString());
DecimalFormat decimalFormat = new DecimalFormat("0.00%");
String format = decimalFormat.format((compositeIndex - lastCompositeIndex) / lastCompositeIndex);
--
Gitblit v1.8.0