moral.git - Gitblit

			@@ -10,16 +10,16 @@
			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.form.aqi.ProvinceCitiesPollutionLevelForm;
			import com.moral.api.pojo.form.aqi.SpecialCitiesPollutionLevelForm;
			import com.moral.api.pojo.form.aqi.*;
			import com.moral.api.pojo.vo.cityAQI.PieChartOfPollutionLevelVO;
			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.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;
			@@ -46,6 +46,14 @@
			SysAreaService sysAreaService;
			@Autowired
			SpecialCitiesProperties specialCitiesProperties;

			@Override
			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) {
			@@ -301,7 +309,7 @@
			List<CityPollutionLevel> datas = new ArrayList<>();
			//遍历每个县级市查询数据
			for (SysArea area : allAreas) {
			CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndCityCode(area,startDate,endDate);
			CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndSysArea(area, startDate, endDate);
			datas.add(cityPollutionLevel);
			}
			return datas;
			@@ -317,7 +325,7 @@
			List<CityPollutionLevel> datas = new ArrayList<>();
			//遍历每个县级市查询数据
			for (SysArea area : areas) {
			CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndCityCode(area,startDate,endDate);
			CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndSysArea(area, startDate, endDate);
			datas.add(cityPollutionLevel);
			}
			return datas;
			@@ -335,11 +343,12 @@
			List<CityPollutionLevel> datas = new ArrayList<>();
			//遍历每个县级市查询数据
			for (SysArea city : allCities) {
			CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndCityCode(city,startDate,endDate);
			CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndSysArea(city, startDate, endDate);
			datas.add(cityPollutionLevel);
			}
			return datas;
			}


			/**
			* @Description: 根据地区对象和开始结束时间计算污染天气
			@@ -348,7 +357,8 @@
			* @Author: 陈凯裕
			* @Date: 2021/12/31
			*/
			private CityPollutionLevel calculateDaysByTimeAndCityCode(SysArea area, Date startDate, Date endDate) {
			@Override
			public CityPollutionLevel calculateDaysByTimeAndSysArea(SysArea area, Date startDate, Date endDate) {
			//查询数据
			QueryWrapper<CityAqiDaily> wrapper = new QueryWrapper<>();
			wrapper.eq("city_code", area.getAreaCode());
			@@ -392,4 +402,9 @@
			return cityPollutionLevel;
			}





			}