From 3cf84aa99a0bb5acddf63eeea9d5d84810105c1e Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 24 Jan 2022 10:12:19 +0800
Subject: [PATCH] 添加边界接口修改
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 220 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 175 insertions(+), 45 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 93b9cf5..b5b1328 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
@@ -3,16 +3,23 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.config.properties.SpecialCitiesProperties;
import com.moral.api.entity.CityAqiDaily;
+import com.moral.api.entity.SysArea;
import com.moral.api.mapper.CityAqiDailyMapper;
+import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;
import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
import com.moral.api.pojo.dto.cityAQI.PollutionDaysAndProportion;
+import com.moral.api.pojo.form.aqi.*;
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.api.service.CityAqiMonthlyService;
+import com.moral.api.service.CityAqiYearlyService;
+import com.moral.api.service.SysAreaService;
import com.moral.constant.Constants;
import com.moral.util.AQIUtils;
+import com.moral.util.ComprehensiveIndexUtils;
import com.moral.util.DateUtils;
import com.moral.util.MathUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,9 +42,21 @@
@Autowired
CityAqiDailyMapper cityAqiDailyMapper;
+ @Autowired
+ SysAreaService sysAreaService;
+ @Autowired
+ SpecialCitiesProperties specialCitiesProperties;
@Override
- public PieChartOfPollutionLevelVO queryPieChartOfPollutionLevels(QueryChartOfPollutionLevelForm form) {
+ public List<CityAqiDaily> getCityAqiDailyByRegionCodeAndTime(Integer regionCode, Date startDate, Date endDate) {
+ QueryWrapper<CityAqiDaily> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("city_code",regionCode);
+ queryWrapper.between("time",startDate,endDate);
+ return cityAqiDailyMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public PieChartOfPollutionLevelVO queryPieChartOfPollutionLevels(ChartOfPollutionLevelForm form) {
//������
Integer regionCode = form.getRegionCode();
Date startDate = form.getStartDate();
@@ -106,7 +125,7 @@
}
@Override
- public List<MonthlyPollutionLevel> queryBarChartOfPollutionLevels(QueryChartOfPollutionLevelForm form) {
+ public List<MonthlyPollutionLevel> queryBarChartOfPollutionLevels(ChartOfPollutionLevelForm form) {
//������
Integer regionCode = form.getRegionCode();
Date startDate = form.getStartDate();
@@ -138,7 +157,7 @@
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()){
+ while (monthlyIterator.hasNext()) {
Map.Entry<String, List<CityAqiDaily>> monthlyEntry = monthlyIterator.next();
List<CityAqiDaily> monthlyValues = monthlyEntry.getValue();
//���������������������������������������
@@ -187,44 +206,44 @@
}
@Override
- public Map<String, Map<String,Object>> oneYearsData(Map map) {
+ public Map<String, Map<String, Object>> oneYearsData(Map map) {
int city_code = Integer.parseInt(map.get("cityCode").toString());
String year = map.get("year").toString();
- String startTime = year+"-01-01 00:00:00";
- String endTime = year+"-12-31 23:59:59";
+ String startTime = year + "-01-01 00:00:00";
+ String endTime = year + "-12-31 23:59:59";
QueryWrapper<CityAqiDaily> cityAqiDailyQueryWrapper = new QueryWrapper<>();
cityAqiDailyQueryWrapper.eq("city_code", city_code);
- cityAqiDailyQueryWrapper.between("time",startTime,endTime);
+ cityAqiDailyQueryWrapper.between("time", startTime, endTime);
List<CityAqiDaily> cityAqiDailies = cityAqiDailyMapper.selectList(cityAqiDailyQueryWrapper);
- Map<String,Map<String,Object>> resultMap = new HashMap<>();
- for (int i=1;i<13;i++){
+ Map<String, Map<String, Object>> resultMap = new HashMap<>();
+ for (int i = 1; i < 13; i++) {
Map<String, Object> monthMap = new HashMap<>();
String month = null;
- if (i<10){
- month = "0"+i;
- }else {
+ if (i < 10) {
+ month = "0" + i;
+ } else {
month = String.valueOf(i);
}
- String monthDate = year+"-"+month;
- String monthFirstDay = year+"-"+month+"-01";
+ String monthDate = year + "-" + month;
+ String monthFirstDay = year + "-" + month + "-01";
int monthDay = DateUtils.getMonthDay(monthFirstDay);
- for (int j=1;j<monthDay+1;j++){
+ for (int j = 1; j < monthDay + 1; j++) {
String day = null;
- if (j<10){
- day = "0"+j;
- }else {
+ if (j < 10) {
+ day = "0" + j;
+ } else {
day = String.valueOf(j);
}
- String dayDate = year+"-"+month+"-"+day;
- monthMap.put(dayDate,null);
+ String dayDate = year + "-" + month + "-" + day;
+ monthMap.put(dayDate, null);
}
- resultMap.put(monthDate,monthMap);
+ resultMap.put(monthDate, monthMap);
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- for (CityAqiDaily cityAqiDaily:cityAqiDailies) {
+ for (CityAqiDaily cityAqiDaily : cityAqiDailies) {
String time = sdf.format(cityAqiDaily.getTime());
- String monthDate = time.substring(0,7);
- String dayDate = time.substring(0,10);
+ String monthDate = time.substring(0, 7);
+ String dayDate = time.substring(0, 10);
Double PM2_5 = null;
Double PM10 = null;
Double SO2 = null;
@@ -236,45 +255,156 @@
String value = cityAqiDaily.getValue();
JSONObject jsonObject = new JSONObject();
jsonObject = JSONObject.parseObject(value);
- if (!ObjectUtils.isEmpty(jsonObject.get("PM2_5"))){
+ if (!ObjectUtils.isEmpty(jsonObject.get("PM2_5"))) {
PM2_5 = (Double.parseDouble(jsonObject.get("PM2_5").toString()));
}
- if (!ObjectUtils.isEmpty(jsonObject.get("PM10"))){
+ if (!ObjectUtils.isEmpty(jsonObject.get("PM10"))) {
PM10 = (Double.parseDouble(jsonObject.get("PM10").toString()));
}
- if (!ObjectUtils.isEmpty(jsonObject.get("SO2"))){
+ if (!ObjectUtils.isEmpty(jsonObject.get("SO2"))) {
SO2 = (Double.parseDouble(jsonObject.get("SO2").toString()));
}
- if (!ObjectUtils.isEmpty(jsonObject.get("NO2"))){
+ if (!ObjectUtils.isEmpty(jsonObject.get("NO2"))) {
NO2 = (Double.parseDouble(jsonObject.get("NO2").toString()));
}
- if (!ObjectUtils.isEmpty(jsonObject.get("CO"))){
+ if (!ObjectUtils.isEmpty(jsonObject.get("CO"))) {
CO = (Double.parseDouble(jsonObject.get("CO").toString()));
}
- if (!ObjectUtils.isEmpty(jsonObject.get("O3"))){
+ if (!ObjectUtils.isEmpty(jsonObject.get("O3"))) {
O3 = (Double.parseDouble(jsonObject.get("O3").toString()));
}
- if (!ObjectUtils.isEmpty(jsonObject.get("primaryPollutant"))){
+ if (!ObjectUtils.isEmpty(jsonObject.get("primaryPollutant"))) {
primaryPollutant = jsonObject.get("primaryPollutant").toString();
}
- if (!ObjectUtils.isEmpty(jsonObject.get("AQI"))){
+ if (!ObjectUtils.isEmpty(jsonObject.get("AQI"))) {
AQI = jsonObject.get("AQI").toString();
}
- Map<String,Object> valueMap = new HashMap<>();
- valueMap.put("PM2_5",PM2_5);
- valueMap.put("PM10",PM10);
- valueMap.put("SO2",SO2);
- valueMap.put("NO2",NO2);
- valueMap.put("CO",CO);
- valueMap.put("O3",O3);
- valueMap.put("AQI",AQI);
- valueMap.put("primaryPollutant",primaryPollutant);
- Map<String,Object> monthMap = new HashMap<>();
+ Map<String, Object> valueMap = new HashMap<>();
+ valueMap.put("PM2_5", PM2_5);
+ valueMap.put("PM10", PM10);
+ valueMap.put("SO2", SO2);
+ valueMap.put("NO2", NO2);
+ valueMap.put("CO", CO);
+ valueMap.put("O3", O3);
+ valueMap.put("AQI", AQI);
+ valueMap.put("primaryPollutant", primaryPollutant);
+ Map<String, Object> monthMap = new HashMap<>();
monthMap = resultMap.get(monthDate);
- monthMap.put(dayDate,valueMap);
- resultMap.put(monthDate,monthMap);
+ monthMap.put(dayDate, valueMap);
+ resultMap.put(monthDate, monthMap);
}
return resultMap;
}
+
+ @Override
+ public List<CityPollutionLevel> queryAreaPollutionLevel(AreaPollutionLevelForm form) {
+ //������
+ Integer regionCode = form.getRegionCode();
+ Date startDate = form.getStartDate();
+ Date endDate = form.getEndDate();
+ //������������������������������
+ List<SysArea> allAreas = sysAreaService.getChildren(regionCode);
+ //������������������������
+ List<CityPollutionLevel> datas = new ArrayList<>();
+ //��������������������� ������������
+ for (SysArea area : allAreas) {
+ CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndSysArea(area, startDate, endDate);
+ datas.add(cityPollutionLevel);
+ }
+ return datas;
+ }
+
+ @Override
+ public List<CityPollutionLevel> querySpecialCitiesPollutionLevel(SpecialCitiesPollutionLevelForm form) {
+ //������
+ Date startDate = form.getStartDate();
+ Date endDate = form.getEndDate();
+ List<SysArea> areas = specialCitiesProperties.getTwentyEightCities();
+ //������������������������
+ List<CityPollutionLevel> datas = new ArrayList<>();
+ //��������������������� ������������
+ for (SysArea area : areas) {
+ CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndSysArea(area, startDate, endDate);
+ datas.add(cityPollutionLevel);
+ }
+ return datas;
+ }
+
+ @Override
+ public List<CityPollutionLevel> queryProvinceCitiesPollutionLevel(ProvinceCitiesPollutionLevelForm form) {
+ //������
+ Date startDate = form.getStartDate();
+ Date endDate = form.getEndDate();
+ Integer regionCode = form.getRegionCode();
+ //������������������������
+ List<SysArea> allCities = sysAreaService.getChildren(regionCode);
+ //������������������������
+ List<CityPollutionLevel> datas = new ArrayList<>();
+ //��������������������� ������������
+ for (SysArea city : allCities) {
+ CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndSysArea(city, startDate, endDate);
+ datas.add(cityPollutionLevel);
+ }
+ return datas;
+ }
+
+
+ /**
+ * @Description: ���������������������������������������������������������
+ * @Param: [area, startDate, endDate]
+ * @return: com.moral.api.pojo.dto.cityAQI.CityPollutionLevel
+ * @Author: ���������
+ * @Date: 2021/12/31
+ */
+ @Override
+ public CityPollutionLevel calculateDaysByTimeAndSysArea(SysArea area, Date startDate, Date endDate) {
+ //������������
+ QueryWrapper<CityAqiDaily> wrapper = new QueryWrapper<>();
+ wrapper.eq("city_code", area.getAreaCode());
+ 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, 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)
+ 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);
+ }
+ //������������
+ CityPollutionLevel cityPollutionLevel = new CityPollutionLevel();
+ cityPollutionLevel.setRegionName(area.getAreaName());
+ cityPollutionLevel.setExcellentWeatherDays(pollutionDaysMap.get(Constants.EXCELLENT_WEATHER_CODE));
+ cityPollutionLevel.setGoodWeatherDays(pollutionDaysMap.get(Constants.GOOD_WEATHER_CODE));
+ cityPollutionLevel.setMildWeatherDays(pollutionDaysMap.get(Constants.MILD_WEATHER_CODE));
+ cityPollutionLevel.setMiddleWeatherDays(pollutionDaysMap.get(Constants.MIDDLE_WEATHER_CODE));
+ cityPollutionLevel.setSeriousWeatherDays(pollutionDaysMap.get(Constants.SERIOUS_WEATHER_CODE));
+ cityPollutionLevel.setServerWeatherDays(pollutionDaysMap.get(Constants.SERVER_WEATHER_CODE));
+ return cityPollutionLevel;
+ }
+
+
+
+
+
}
+
--
Gitblit v1.8.0