Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

 screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java

@@ -2,14 +2,13 @@

import com.moral.api.entity.CityAqiDaily;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.entity.SysArea;
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.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 java.util.Date;
import java.util.List;
import java.util.Map;

@@ -22,6 +21,15 @@
 * @since 2021-11-01
 */
public interface CityAqiDailyService extends IService<CityAqiDaily> {

    /**
     * @Description: 根据地区码和时间获取数据
     * @Param: [regionCode, startDate, endDate]
     * @return: java.util.List<com.moral.api.entity.CityAqiDaily>
     * @Author: 陈凯裕
     * @Date: 2022/1/17
     */
    List<CityAqiDaily> getCityAqiDailyByRegionCodeAndTime(Integer regionCode, Date startDate, Date endDate);

    /**
    * @Description: 查询污染等级的饼状图，包括天数，占比
@@ -76,4 +84,15 @@
            * @Date: 2022/1/7
            */
    List<CityPollutionLevel> queryProvinceCitiesPollutionLevel(ProvinceCitiesPollutionLevelForm form);

    /**
    * @Description: 根据地区和开始结束时间计算优良天气数
            * @Param: [area, startDate, endDate]
            * @return: com.moral.api.pojo.dto.cityAQI.CityPollutionLevel
            * @Author: 陈凯裕
            * @Date: 2022/1/17
            */
    CityPollutionLevel calculateDaysByTimeAndSysArea(SysArea area, Date startDate, Date endDate);


}