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

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

 screen-api/src/main/java/com/moral/api/controller/AqiController.java

@@ -1,10 +1,13 @@
package com.moral.api.controller;

import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;
import com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent;
import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
import com.moral.api.pojo.form.aqi.*;
import com.moral.api.pojo.vo.cityAQI.AirQualityComparisonVO;
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.service.CityAqiDailyService;

import io.swagger.annotations.Api;
@@ -99,7 +102,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(),
@@ -110,14 +113,14 @@
    }

    /**
    * @Description: 获取城市优良天气占比的柱状图数据
            * @Param: [form]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2021/11/22
            */
     * @Description: 获取城市优良天气占比的柱状图数据
     * @Param: [form]
     * @return: com.moral.constant.ResultMessage
     * @Author: 陈凯裕
     * @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(),
@@ -131,14 +134,14 @@
    }

    /**
    * @Description: 获取城市优良天气占比的柱状图下的表格数据
            * @Param: [form]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2021/11/22
            */
     * @Description: 获取城市优良天气占比的柱状图下的表格数据
     * @Param: [form]
     * @return: com.moral.constant.ResultMessage
     * @Author: 陈凯裕
     * @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(),
@@ -174,7 +177,7 @@
            @ApiImplicitParam(name = "time", value = "时间，排名类型为day,month,year是需传此参", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "start", value = "开始时间，排名类型为custom自定义是传此参，精确到日，如：2021-11-02", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "end", value = "结束时间，排名类型为custom自定义是传此参，精确到日，如：2021-11-03", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "cityType", value = "城市类型，省内城市：province，市区排名：city", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "cityType", value = "城市类型，省内城市：province，市区排名：city，2+28城市排名：28", required = true, paramType = "query", dataType = "String"),
    })
    public ResultMessage rankingDetails(HttpServletRequest request) {
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
@@ -196,4 +199,80 @@
        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);
    }

    /**
     * @Description: 查询26+2城市优良天气数据
     * @Param: [form]
     * @return: com.moral.constant.ResultMessage
     * @Author: 陈凯裕
     * @Date: 2021/12/31
     */
    @GetMapping("qeury28CitiesPollutionLevel")
    public ResultMessage query28CitiesPollutionLevel(SpecialCitiesPollutionLevelForm form) {
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        //查询业务数据
        List<CityPollutionLevel> datas = cityAqiDailyService.querySpecialCitiesPollutionLevel(form);
        //返回数据
        return ResultMessage.ok(datas);
    }

    /**
    * @Description: 查询一个省内所有城市的优良天数
            * @Param: [form]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2022/1/7
            */
    @GetMapping("queryProvinceCitiesPollutionLevel")
    public ResultMessage queryProvinceCitiesPollutionLevel(ProvinceCitiesPollutionLevelForm form) {
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        //查询业务数据
        List<CityPollutionLevel> datas = cityAqiDailyService.queryProvinceCitiesPollutionLevel(form);
        //返回数据
        return ResultMessage.ok(datas);
    }

    /** 
    * @Description: 查询城市空气质量同期对比数据
            * @Param: [form]
            * @return: com.moral.constant.ResultMessage
            * @Author: 陈凯裕
            * @Date: 2022/1/12
            */ 
    @GetMapping("queryAirQualityComparison")
    public ResultMessage queryAirQualityComparison(AirQualityComparisonForm form){
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        //查询业务
        List<AirQualityComparisonVO> datas = cityAqiService.queryAirQualityComparison(form);
        //返回数据
        return ResultMessage.ok(datas);
    }

}