From bd9a7f2d97af968d43ccd5516644f6933b42f5b2 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Thu, 30 Dec 2021 11:47:59 +0800 Subject: [PATCH] screen-api 增加城市优良天气对比接口 --- screen-common/src/main/java/com/moral/util/DateUtils.java | 73 ++++------ screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/CityPollutionLevel.java | 51 +++++++ screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java | 7 + screen-api/src/main/java/com/moral/api/controller/AqiController.java | 29 +++ screen-api/src/main/java/com/moral/api/pojo/form/aqi/AreaPollutionLevelForm.java | 68 +++++++++ screen-api/src/main/java/com/moral/api/utils/UnitConvertUtils.java | 1 screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 153 +++++++++++++++------ 7 files changed, 289 insertions(+), 93 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/controller/AqiController.java b/screen-api/src/main/java/com/moral/api/controller/AqiController.java index e6302ef..b504c3b 100644 --- a/screen-api/src/main/java/com/moral/api/controller/AqiController.java +++ b/screen-api/src/main/java/com/moral/api/controller/AqiController.java @@ -1,10 +1,12 @@ package com.moral.api.controller; +import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel; import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel; +import com.moral.api.pojo.form.aqi.AreaPollutionLevelForm; import com.moral.api.pojo.vo.cityAQI.BarChartOfPollutionLevelVO; import com.moral.api.pojo.vo.cityAQI.BarChartTableOfPollutionLevelVO; import com.moral.api.pojo.vo.cityAQI.PieChartOfPollutionLevelVO; -import com.moral.api.pojo.form.aqi.QueryChartOfPollutionLevelForm; +import com.moral.api.pojo.form.aqi.ChartOfPollutionLevelForm; import com.moral.api.service.CityAqiDailyService; import io.swagger.annotations.Api; @@ -99,7 +101,7 @@ * @Date: 2021/11/11 */ @GetMapping("queryPieChartOfPollutionLevel") - public ResultMessage queryPieChartOfPollutionLevel(QueryChartOfPollutionLevelForm form) { + public ResultMessage queryPieChartOfPollutionLevel(ChartOfPollutionLevelForm form) { //������������������������ if (!form.valid()) return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), @@ -117,7 +119,7 @@ * @Date: 2021/11/22 */ @GetMapping("queryBarChartOfPollutionLevel") - public ResultMessage queryBarChartOfPollutionLevel(QueryChartOfPollutionLevelForm form){ + public ResultMessage queryBarChartOfPollutionLevel(ChartOfPollutionLevelForm form){ //������������������������ if (!form.valid()) return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), @@ -138,7 +140,7 @@ * @Date: 2021/11/22 */ @GetMapping("queryBarChatTableOfPollutionLevel") - public ResultMessage queryBarChatTableOfPollutionLevel(QueryChartOfPollutionLevelForm form){ + public ResultMessage queryBarChatTableOfPollutionLevel(ChartOfPollutionLevelForm form){ //������������������������ if (!form.valid()) return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), @@ -196,4 +198,23 @@ return ResultMessage.ok(response); } + /** + * @Description: ������������������������������������������������ + * @Param: [regionCode] + * @return: com.moral.constant.ResultMessage + * @Author: ��������� + * @Date: 2021/12/30 + */ + @GetMapping("queryAreaPollutionLevel") + public ResultMessage queryAreaPollutionLevel(AreaPollutionLevelForm form){ + //������������������������ + if (!form.valid()) + return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), + ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + //������������������ + List<CityPollutionLevel> datas = cityAqiDailyService.queryAreaPollutionLevel(form); + + return ResultMessage.ok(datas); + } + } diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/CityPollutionLevel.java b/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/CityPollutionLevel.java new file mode 100644 index 0000000..033332b --- /dev/null +++ b/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/CityPollutionLevel.java @@ -0,0 +1,51 @@ +package com.moral.api.pojo.dto.cityAQI; + +import com.moral.constant.Constants; +import lombok.Data; + +/** + * @ClassName AreaPollutionLevel + * @Description ������������������������������������������ + * @Author ��������� + * @Date 2021/12/30 10:30 + * @Version TODO + **/ +@Data +public class CityPollutionLevel { + + /* + * ������������ + * */ + private String regionName; + + /* + * ��������������� + * */ + private Integer excellentWeatherDays; + + /* + * ��������������� + * */ + private Integer goodWeatherDays; + + /* + * ������������������������ + * */ + private Integer mildWeatherDays; + + /* + * ������������������������ + * */ + private Integer middleWeatherDays; + + /* + * ������������������������ + * */ + private Integer seriousWeatherDays; + + /* + * ������������������������ + * */ + private Integer serverWeatherDays; + +} diff --git a/screen-api/src/main/java/com/moral/api/pojo/form/aqi/AreaPollutionLevelForm.java b/screen-api/src/main/java/com/moral/api/pojo/form/aqi/AreaPollutionLevelForm.java new file mode 100644 index 0000000..70b13bc --- /dev/null +++ b/screen-api/src/main/java/com/moral/api/pojo/form/aqi/AreaPollutionLevelForm.java @@ -0,0 +1,68 @@ +package com.moral.api.pojo.form.aqi; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.moral.util.DateUtils; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @ClassName AreaPollutionLevelForm + * @Description TODO + * @Author ��������� + * @Date 2021/12/30 10:37 + * @Version TODO + **/ +@Data +public class AreaPollutionLevelForm { + + /* + * ��������� + * */ + private Integer regionCode; + + /* + * ��������������������������������������������� + * */ + @DateTimeFormat(pattern = "yyyy") + @JsonFormat(pattern = "yyyy", timezone = "GMT+8") + private Date year; + + /* + * ��������������������������������������������� + * */ + @DateTimeFormat(pattern = "yyyy-MM") + @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8") + private Date month; + + /* + * ���������������������������������������form������������ + * */ + private Date startDate; + + /* + * ���������������������������������������form������������ + * */ + private Date endDate; + + public boolean valid() { + if (regionCode == null || (year == null && month == null)||(year != null && month != null)) + return false; + //������regionCode������ + String regionCodeStr = regionCode.toString(); + if (!regionCodeStr.substring(regionCodeStr.length() - 2, regionCodeStr.length()).equals("00")) + return false; + //������������ + if (year != null) { + startDate = DateUtils.getFirstDayOfYear(year); + endDate = DateUtils.getLastDayOfYear(year); + return true; + } + startDate = DateUtils.getFirstDayOfMonth(month); + endDate = DateUtils.getLastDayOfMonth(month); + return true; + } + + +} 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..44e67e4 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,13 +4,17 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.AreaPollutionLevelForm; import com.moral.api.pojo.vo.cityAQI.PieChartOfPollutionLevelVO; -import com.moral.api.pojo.form.aqi.QueryChartOfPollutionLevelForm; +import com.moral.api.pojo.form.aqi.ChartOfPollutionLevelForm; import com.moral.api.service.CityAqiDailyService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.moral.api.service.SysAreaService; import com.moral.constant.Constants; import com.moral.util.AQIUtils; import com.moral.util.DateUtils; @@ -35,9 +39,11 @@ @Autowired CityAqiDailyMapper cityAqiDailyMapper; + @Autowired + SysAreaService sysAreaService; @Override - public PieChartOfPollutionLevelVO queryPieChartOfPollutionLevels(QueryChartOfPollutionLevelForm form) { + public PieChartOfPollutionLevelVO queryPieChartOfPollutionLevels(ChartOfPollutionLevelForm form) { //������ Integer regionCode = form.getRegionCode(); Date startDate = form.getStartDate(); @@ -106,7 +112,7 @@ } @Override - public List<MonthlyPollutionLevel> queryBarChartOfPollutionLevels(QueryChartOfPollutionLevelForm form) { + public List<MonthlyPollutionLevel> queryBarChartOfPollutionLevels(ChartOfPollutionLevelForm form) { //������ Integer regionCode = form.getRegionCode(); Date startDate = form.getStartDate(); @@ -138,7 +144,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 +193,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 +242,102 @@ 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) { + //������������ + 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)); + datas.add(cityPollutionLevel); + } + return datas; + } + } diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java index 8a83c9b..a86c8f6 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java @@ -96,6 +96,13 @@ return newList; } + @Override + public List<SysArea> getChildren(Integer regionCode) { + QueryWrapper<SysArea> wrapper = new QueryWrapper<>(); + wrapper.eq("parent_code",regionCode); + return sysAreaMapper.selectList(wrapper); + } + //������������������������ private List<Map<String, Object>> getAreasByRecursion(SysArea sysArea, List<SysArea> sysAreas) { SysArea newSysArea = new SysArea(); diff --git a/screen-api/src/main/java/com/moral/api/utils/UnitConvertUtils.java b/screen-api/src/main/java/com/moral/api/utils/UnitConvertUtils.java index 5355a24..351b648 100644 --- a/screen-api/src/main/java/com/moral/api/utils/UnitConvertUtils.java +++ b/screen-api/src/main/java/com/moral/api/utils/UnitConvertUtils.java @@ -177,4 +177,5 @@ } + } diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java index 8889611..439c5d2 100644 --- a/screen-common/src/main/java/com/moral/util/DateUtils.java +++ b/screen-common/src/main/java/com/moral/util/DateUtils.java @@ -977,6 +977,35 @@ } /* + * ��������������������������������� + * */ + public static Date getFirstDayOfMonth(Date date){ + final Calendar cal = Calendar.getInstance(); + cal.setTime(date); + final int last = cal.getActualMinimum(Calendar.DAY_OF_MONTH); + cal.set(Calendar.DAY_OF_MONTH, last); + cal.set(Calendar.HOUR_OF_DAY,0); + cal.set(Calendar.MINUTE,0); + cal.set(Calendar.SECOND,0); + return cal.getTime(); + } + + /* + * ������������������������������������ + * */ + public static Date getLastDayOfMonth(Date date) { + final Calendar cal = Calendar.getInstance(); + cal.setTime(date); + final int last = cal.getActualMaximum(Calendar.DAY_OF_MONTH); + cal.set(Calendar.DAY_OF_YEAR, last); + cal.set(Calendar.HOUR_OF_DAY, 23); + cal.set(Calendar.MINUTE, 59); + cal.set(Calendar.SECOND, 59); + return cal.getTime(); + } + + + /* * ��������������������������� * */ public static boolean isCurrentYear(Date date) { @@ -1018,50 +1047,6 @@ throw new RuntimeException(e); } return date; - } - - /** - * ������������������������������ - * - * @param year - * @param month - * @return - */ - public static String getFirstDayOfMonth(int year, int month) { - Calendar cal = Calendar.getInstance(); - // ������������ - cal.set(Calendar.YEAR, year); - // ������������ - cal.set(Calendar.MONTH, month - 1); - // ������������������������ - int lastDay = cal.getActualMinimum(Calendar.DAY_OF_MONTH); - // ������������������������������������ - cal.set(Calendar.DAY_OF_MONTH, lastDay); - // ��������������� - DateFormat df = getDateFormat(yyyy_MM_dd_EN); - return df.format(cal.getTime()); - } - - /** - * ������������������������������ - * - * @param year - * @param month - * @return - */ - public static String getLastDayOfMonth(int year, int month) { - Calendar cal = Calendar.getInstance(); - // ������������ - cal.set(Calendar.YEAR, year); - // ������������ - cal.set(Calendar.MONTH, month - 1); - // ������������������������ - int lastDay = cal.getActualMaximum(Calendar.DAY_OF_MONTH); - // ������������������������������������ - cal.set(Calendar.DAY_OF_MONTH, lastDay); - // ��������������� - DateFormat df = getDateFormat(yyyy_MM_dd_EN); - return df.format(cal.getTime()); } /** -- Gitblit v1.8.0