From 62e7442abe2ad4b296d0211e6f0cd327865fe24f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 22 Nov 2021 17:13:44 +0800
Subject: [PATCH] screen-api 完成柱状图数据和表格的逻辑代码
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 151 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 119 insertions(+), 32 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
index a360244..29c0706 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
@@ -4,8 +4,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.CityAqiDaily;
import com.moral.api.mapper.CityAqiDailyMapper;
-import com.moral.api.pojo.dto.cityAQI.PieChartOfPollutionLevelVO;
-import com.moral.api.pojo.form.aqi.QueryPieChartOfPollutionLevelForm;
+import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
+import com.moral.api.pojo.dto.cityAQI.PollutionDaysAndProportion;
+import com.moral.api.pojo.vo.cityAQI.PieChartOfPollutionLevelVO;
+import com.moral.api.pojo.form.aqi.QueryChartOfPollutionLevelForm;
import com.moral.api.service.CityAqiDailyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -14,7 +16,9 @@
import com.moral.util.MathUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -32,65 +36,65 @@
CityAqiDailyMapper cityAqiDailyMapper;
@Override
- public PieChartOfPollutionLevelVO queryPieChartOfPollutionLevels(QueryPieChartOfPollutionLevelForm form) {
+ public PieChartOfPollutionLevelVO queryPieChartOfPollutionLevels(QueryChartOfPollutionLevelForm form) {
//������
Integer regionCode = form.getRegionCode();
Date startDate = form.getStartDate();
Date endDate = form.getEndDate();
//������������
QueryWrapper<CityAqiDaily> wrapper = new QueryWrapper<>();
- wrapper.eq("city_code",regionCode);
- wrapper.between("time",startDate,endDate);
+ wrapper.eq("city_code", regionCode);
+ wrapper.between("time", startDate, endDate);
List<CityAqiDaily> cityAqiDailies = cityAqiDailyMapper.selectList(wrapper);
//���������������������,������������time
- if(cityAqiDailies.size()==0)
+ if (cityAqiDailies.size() == 0)
return null;
- String startTime = DateUtils.dateToDateString(cityAqiDailies.get(0).getTime(),"yyyy-MM-dd");
- String endTime = DateUtils.dateToDateString(cityAqiDailies.get(cityAqiDailies.size()-1).getTime(),"yyyy-MM-dd");
- String time = startTime+" ��� "+endTime;
+ String startTime = DateUtils.dateToDateString(cityAqiDailies.get(0).getTime(), "yyyy-MM-dd");
+ String endTime = DateUtils.dateToDateString(cityAqiDailies.get(cityAqiDailies.size() - 1).getTime(), "yyyy-MM-dd");
+ String time = startTime + " ��� " + endTime;
//���������������������������������������
- Map<String,CityAqiDaily> tmpMap = new HashMap<>();
+ Map<String, CityAqiDaily> tmpMap = new HashMap<>();
for (CityAqiDaily cityAqiDaily : cityAqiDailies) {
- String tmpTime = DateUtils.dateToDateString(cityAqiDaily.getTime(),"yyyy-MM-dd");
- tmpMap.put(tmpTime,cityAqiDaily);
+ String tmpTime = DateUtils.dateToDateString(cityAqiDaily.getTime(), "yyyy-MM-dd");
+ tmpMap.put(tmpTime, cityAqiDaily);
}
cityAqiDailies = new ArrayList<CityAqiDaily>(tmpMap.values());
//������������������������������
- Map<String,Integer> pollutionDaysMap = new LinkedHashMap<>();
- pollutionDaysMap.put(Constants.EXCELLENT_WEATHER_CODE,0);
- pollutionDaysMap.put(Constants.GOOD_WEATHER_CODE,0);
- pollutionDaysMap.put(Constants.MILD_WEATHER_CODE,0);
- pollutionDaysMap.put(Constants.MIDDLE_WEATHER_CODE,0);
- pollutionDaysMap.put(Constants.SERIOUS_WEATHER_CODE,0);
- pollutionDaysMap.put(Constants.SERVER_WEATHER_CODE,0);
+ Map<String, Integer> pollutionDaysMap = new LinkedHashMap<>();
+ pollutionDaysMap.put(Constants.EXCELLENT_WEATHER_CODE, 0);
+ pollutionDaysMap.put(Constants.GOOD_WEATHER_CODE, 0);
+ pollutionDaysMap.put(Constants.MILD_WEATHER_CODE, 0);
+ pollutionDaysMap.put(Constants.MIDDLE_WEATHER_CODE, 0);
+ pollutionDaysMap.put(Constants.SERIOUS_WEATHER_CODE, 0);
+ pollutionDaysMap.put(Constants.SERVER_WEATHER_CODE, 0);
for (CityAqiDaily cityAqiDaily : cityAqiDailies) {
- Map<String,Object> valueMap = JSON.parseObject(cityAqiDaily.getValue(),Map.class);
- if(valueMap.get("AQI")==null)
+ Map<String, Object> valueMap = JSON.parseObject(cityAqiDaily.getValue(), Map.class);
+ if (valueMap.get("AQI") == null)
continue;
Integer aqi = Integer.valueOf(valueMap.get("AQI").toString());
//������AQI������������
String pollutionClass = AQIUtils.classCodeOfPollutionByAqi(aqi);
Integer days = pollutionDaysMap.get(pollutionClass);
- pollutionDaysMap.put(pollutionClass,days+1);
+ pollutionDaysMap.put(pollutionClass, days + 1);
}
//������������
- List<Map<String,Object>> valueMap = new ArrayList<>();
+ List<Map<String, Object>> valueMap = new ArrayList<>();
Set<Map.Entry<String, Integer>> entries = pollutionDaysMap.entrySet();
Iterator<Map.Entry<String, Integer>> iterator = entries.iterator();
Integer totalDays = 0;
- while(iterator.hasNext()){
+ while (iterator.hasNext()) {
Map.Entry<String, Integer> entry = iterator.next();
- Map<String,Object> pollutionMap = new HashMap<>();
+ Map<String, Object> pollutionMap = new HashMap<>();
String pollution = entry.getKey();
Integer days = entry.getValue();
- Double proportionTmp = MathUtils.division(Double.valueOf(days),Double.valueOf(cityAqiDailies.size()),3);
- Double proportionD = MathUtils.mul(proportionTmp,100);
- String proportion = proportionD.toString()+"%";
- pollutionMap.put("proportion",proportion);
- pollutionMap.put("pollution",pollution);
- pollutionMap.put("days",days);
+ Double proportionTmp = MathUtils.division(Double.valueOf(days), Double.valueOf(cityAqiDailies.size()), 3);
+ Double proportionD = MathUtils.mul(proportionTmp, 100);
+ String proportion = proportionD.toString() + "%";
+ pollutionMap.put("proportion", proportion);
+ pollutionMap.put("pollution", pollution);
+ pollutionMap.put("days", days);
valueMap.add(pollutionMap);
- totalDays+=days;
+ totalDays += days;
}
//������������������
PieChartOfPollutionLevelVO VO = new PieChartOfPollutionLevelVO();
@@ -99,4 +103,87 @@
VO.setTotalDays(totalDays);
return VO;
}
+
+ @Override
+ public List<MonthlyPollutionLevel> queryBarChartOfPollutionLevels(QueryChartOfPollutionLevelForm form) {
+ //������
+ Integer regionCode = form.getRegionCode();
+ Date startDate = form.getStartDate();
+ Date endDate = form.getEndDate();
+ //������������
+ QueryWrapper<CityAqiDaily> wrapper = new QueryWrapper<>();
+ wrapper.eq("city_code", regionCode);
+ wrapper.between("time", startDate, endDate);
+ wrapper.orderByAsc("time");
+ List<CityAqiDaily> cityAqiDailies = cityAqiDailyMapper.selectList(wrapper);
+ //���������������������������������������
+ Map<String, CityAqiDaily> tmpMap = new LinkedHashMap<>();
+ for (CityAqiDaily cityAqiDaily : cityAqiDailies) {
+ String tmpTime = DateUtils.dateToDateString(cityAqiDaily.getTime(), "yyyy-MM-dd");
+ tmpMap.put(tmpTime, cityAqiDaily);
+ }
+ cityAqiDailies = new ArrayList<CityAqiDaily>(tmpMap.values());
+ //���������������������������������
+ Map<String, List<CityAqiDaily>> monthlyDataMap = new LinkedHashMap<>();
+ cityAqiDailies.forEach(value -> {
+ String month = DateUtils.dateToDateString(value.getTime(), "yyyy-MM");
+ List<CityAqiDaily> dataList = monthlyDataMap.get(month);
+ if (ObjectUtils.isEmpty(dataList))
+ dataList = new ArrayList<>();
+ dataList.add(value);
+ monthlyDataMap.put(month, dataList);
+ });
+ //���������������������������
+ List<MonthlyPollutionLevel> monthlyPollutionLevels = new ArrayList<>();
+ Set<Map.Entry<String, List<CityAqiDaily>>> monthlyEntries = monthlyDataMap.entrySet();
+ Iterator<Map.Entry<String, List<CityAqiDaily>>> monthlyIterator = monthlyEntries.iterator();
+ while(monthlyIterator.hasNext()){
+ Map.Entry<String, List<CityAqiDaily>> monthlyEntry = monthlyIterator.next();
+ List<CityAqiDaily> monthlyValues = monthlyEntry.getValue();
+ //���������������������������������������
+ Map<String, Integer> pollutionDaysMap = new LinkedHashMap<>();
+ pollutionDaysMap.put(Constants.EXCELLENT_WEATHER_CODE, 0);
+ pollutionDaysMap.put(Constants.GOOD_WEATHER_CODE, 0);
+ pollutionDaysMap.put(Constants.MILD_WEATHER_CODE, 0);
+ pollutionDaysMap.put(Constants.MIDDLE_WEATHER_CODE, 0);
+ pollutionDaysMap.put(Constants.SERIOUS_WEATHER_CODE, 0);
+ pollutionDaysMap.put(Constants.SERVER_WEATHER_CODE, 0);
+ for (CityAqiDaily cityAqiDaily : monthlyValues) {
+ Map<String, Object> valueMap = JSON.parseObject(cityAqiDaily.getValue(), Map.class);
+ if (valueMap.get("AQI") == null)
+ continue;
+ Integer aqi = Integer.valueOf(valueMap.get("AQI").toString());
+ //������AQI������������
+ String pollutionClass = AQIUtils.classCodeOfPollutionByAqi(aqi);
+ Integer days = pollutionDaysMap.get(pollutionClass);
+ pollutionDaysMap.put(pollutionClass, days + 1);
+ }
+
+ //������������
+ List<PollutionDaysAndProportion> pollutionDaysAndProportions = new ArrayList<>();
+ Set<Map.Entry<String, Integer>> entries = pollutionDaysMap.entrySet();
+ Iterator<Map.Entry<String, Integer>> iterator = entries.iterator();
+ while (iterator.hasNext()) {
+ Map.Entry<String, Integer> entry = iterator.next();
+ String pollution = entry.getKey();
+ Integer days = entry.getValue();
+ Double proportionTmp = MathUtils.division(Double.valueOf(days), Double.valueOf(monthlyValues.size()), 3);
+ Double proportionD = MathUtils.mul(proportionTmp, 100);
+ String proportion = proportionD.toString() + "%";
+ PollutionDaysAndProportion pollutionDaysAndProportion = new PollutionDaysAndProportion();
+ pollutionDaysAndProportion.setDays(days);
+ pollutionDaysAndProportion.setPollutionLevel(pollution);
+ pollutionDaysAndProportion.setProportion(proportion);
+ pollutionDaysAndProportions.add(pollutionDaysAndProportion);
+ }
+ //������������������
+ MonthlyPollutionLevel monthlyPollutionLevel = new MonthlyPollutionLevel();
+ monthlyPollutionLevel.setPollutionDaysAndProportions(pollutionDaysAndProportions);
+ monthlyPollutionLevel.setTime(monthlyEntry.getKey());
+ monthlyPollutionLevels.add(monthlyPollutionLevel);
+ }
+ return monthlyPollutionLevels;
+ }
+
+
}
--
Gitblit v1.8.0