screen-api/src/main/java/com/moral/api/controller/AqiController.java
@@ -1,5 +1,7 @@ package com.moral.api.controller; import com.moral.api.pojo.dto.dataDisplay.PollutionLevelProportionDTO; import com.moral.api.service.CityAqiDailyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -29,6 +31,8 @@ @Autowired private CityAqiService cityAqiService; @Autowired private CityAqiDailyService cityAqiDailyService; @GetMapping("compareO3") @ApiOperation(value = "预测和实测臭氧对比", notes = "预测和实测臭氧对比") @@ -83,6 +87,12 @@ return ResultMessage.ok(datas); } @GetMapping("queryPollutionLevelsForThisYear") public ResultMessage queryPollutionLevelsForThisYear(Integer regionCode){ PollutionLevelProportionDTO dto = cityAqiDailyService.queryPollutionLevelsForThisYear(regionCode); return ResultMessage.ok(dto); } @GetMapping("provincialRanking") @ApiOperation(value = "省内排名", notes = "省内排名") @ApiImplicitParams(value = { screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/PollutionLevelProportionDTO.java
New file @@ -0,0 +1,28 @@ package com.moral.api.pojo.dto.dataDisplay; import lombok.Data; import java.util.List; import java.util.Map; /** * @ClassName ProportionOfWeather * @Description 各种污染等级占比DTO * @Author 陈凯裕 * @Date 2021/11/9 8:49 * @Version TODO **/ @Data public class PollutionLevelProportionDTO { /*时间格式yyyy-MM-dd 至 yyyy-MM-dd*/ private String time; /* * List中一共有6个map，分别是优，良，轻度污染，中度污染，重度污染，严重污染的天数以及占比的数据。 * List中Map的key取值 * pollution：天气污染等级 * days:对应天气污染等级的天数 * proportion:对应天气污染等级占总天数的比例 * */ private List<Map<String,Object>> values; } screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java
@@ -2,6 +2,7 @@ import com.moral.api.entity.CityAqiDaily; import com.baomidou.mybatisplus.extension.service.IService; import com.moral.api.pojo.dto.dataDisplay.PollutionLevelProportionDTO; /** * <p> @@ -13,4 +14,13 @@ */ public interface CityAqiDailyService extends IService<CityAqiDaily> { /** * @Description: 查询今年各种污染等级的占比以及天数 * @Param: [regionCode] * @return: com.moral.api.pojo.dto.dataDisplay.PollutionLevelProportionDTO * @Author: 陈凯裕 * @Date: 2021/11/9 */ PollutionLevelProportionDTO queryPollutionLevelsForThisYear(Integer regionCode); } screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
@@ -1,10 +1,19 @@ package com.moral.api.service.impl; import com.alibaba.fastjson.JSON; 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.dataDisplay.PollutionLevelProportionDTO; import com.moral.api.service.CityAqiDailyService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.moral.util.AQIUtils; import com.moral.util.DateUtils; import com.moral.util.MathUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; /** * <p> @@ -17,4 +26,69 @@ @Service public class CityAqiDailyServiceImpl extends ServiceImpl<CityAqiDailyMapper, CityAqiDaily> implements CityAqiDailyService { @Autowired CityAqiDailyMapper cityAqiDailyMapper; @Override public PollutionLevelProportionDTO queryPollutionLevelsForThisYear(Integer regionCode) { //获取时间 今年第一天 至 Date startDate = DateUtils.getFirstDayOfCurrYear(); Date endDate = DateUtils.getYesterdayDate(); //查询数据 QueryWrapper<CityAqiDaily> wrapper = new QueryWrapper<>(); wrapper.eq("city_code",regionCode); wrapper.between("time",startDate,endDate); List<CityAqiDaily> cityAqiDailies = cityAqiDailyMapper.selectList(wrapper); //取开始结束时间,拼装返回time 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; //如果时间有重复则去重 Map<String,CityAqiDaily> tmpMap = new HashMap<>(); 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 HashMap<>(); 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.classOfPollutionByAqi(aqi); Integer days = pollutionDaysMap.get(pollutionClass); if(days==null){ pollutionDaysMap.put(pollutionClass,1); }else{ pollutionDaysMap.put(pollutionClass,days+1); } } //计算比例 List<Map<String,Object>> valueMap = 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(); 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 proprtionD = MathUtils.mul(proportionTmp,100); String proportion = proprtionD.toString()+"%"; pollutionMap.put("proportion",proportion); pollutionMap.put("pollution",pollution); pollutionMap.put("days",days); valueMap.add(pollutionMap); } //封装返回对象 PollutionLevelProportionDTO dto = new PollutionLevelProportionDTO(); dto.setTime(time); dto.setValues(valueMap); return dto; } } screen-common/src/main/java/com/moral/constant/Constants.java
@@ -244,15 +244,15 @@ * */ public static final String NORMAL_FLAG = "N"; public static final String EXCELLENT = "优"; public static final String EXCELLENT_WEATHER = "优"; public static final String GOOD = "良"; public static final String GOOD_WEATHER = "良"; public static final String MILD = "轻度污染"; public static final String MILD_WEATHER = "轻度污染"; public static final String MIDDLE = "中度污染"; public static final String MIDDLE_WEATHER = "中度污染"; public static final String SERIOUS = "重度污染"; public static final String SERIOUS_WEATHER = "重度污染"; public static final String SERVER = "严重污染"; public static final String SERVER_WEATHER = "严重污染"; } screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -939,6 +939,15 @@ return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN)); } /* * 获取今年的第一天 * */ public static Date getFirstDayOfCurrYear(){ Calendar cal = Calendar.getInstance(); cal.set(Calendar.DAY_OF_YEAR,1); return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN)); } /** * 获取当前月的最后一天 * @@ -1030,6 +1039,18 @@ return df.format(calendar.getTime()); } /* * 获取昨天Date * */ public static Date getYesterdayDate(){ Calendar cal = Calendar.getInstance(); cal.setTime(new Date()); cal.set(Calendar.HOUR_OF_DAY, 0); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); cal.add(Calendar.DAY_OF_MONTH, -1); return cal.getTime(); } /** * 10位时间戳转时间
