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,7 +1,13 @@
package com.moral.api.controller;

import com.moral.api.pojo.dto.dataDisplay.PieChartOfPollutionLevelDTO;
import com.moral.api.pojo.form.aqi.QueryPieChartOfPollutionLevelForm;
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.service.CityAqiDailyService;

import io.swagger.annotations.Api;
@@ -15,10 +21,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

import javax.servlet.http.HttpServletRequest;

@@ -99,105 +102,58 @@
     * @Date: 2021/11/11
     */
    @GetMapping("queryPieChartOfPollutionLevel")
    public ResultMessage queryPieChartOfPollutionLevel(QueryPieChartOfPollutionLevelForm form) {
    public ResultMessage queryPieChartOfPollutionLevel(ChartOfPollutionLevelForm form) {
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());

        PieChartOfPollutionLevelDTO dto = cityAqiDailyService.queryPieChartOfPollutionLevels(form);
        return ResultMessage.ok(dto);
        PieChartOfPollutionLevelVO VO = cityAqiDailyService.queryPieChartOfPollutionLevels(form);
        return ResultMessage.ok(VO);
    }

    @GetMapping("test")
    public ResultMessage test(){
        List<PieChartOfPollutionLevelDTO> dtos = new ArrayList<>();
        PieChartOfPollutionLevelDTO dto = new PieChartOfPollutionLevelDTO();
        dto.setTime("2021-11");
        dto.setTotalDays(10);
        List<Map<String,Object>> list = new ArrayList<>();
        Map<String,Object> map = new HashMap<>();
        map.put("proportion","40%");
        map.put("days",4);
        map.put("pollution",0);
        list.add(map);
    /**
     * @Description: 获取城市优良天气占比的柱状图数据
     * @Param: [form]
     * @return: com.moral.constant.ResultMessage
     * @Author: 陈凯裕
     * @Date: 2021/11/22
     */
    @GetMapping("queryBarChartOfPollutionLevel")
    public ResultMessage queryBarChartOfPollutionLevel(ChartOfPollutionLevelForm form) {
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        //查询数据
        List<MonthlyPollutionLevel> datas = cityAqiDailyService.queryBarChartOfPollutionLevels(form);
        //数据格式转换
        BarChartOfPollutionLevelVO vo = BarChartOfPollutionLevelVO.convert(datas);
        return ResultMessage.ok(vo);

        Map<String,Object> map1 = new HashMap<>();
        map1.put("proportion","30%");
        map1.put("days",3);
        map1.put("pollution",1);
        list.add(map1);
    }

        Map<String,Object> map2 = new HashMap<>();
        map2.put("proportion","30%");
        map2.put("days",3);
        map2.put("pollution",2);
        list.add(map2);

        Map<String,Object> map3 = new HashMap<>();
        map3.put("proportion","0%");
        map3.put("days",0);
        map3.put("pollution",3);
        list.add(map3);

        Map<String,Object> map4 = new HashMap<>();
        map4.put("proportion","0%");
        map4.put("days",0);
        map4.put("pollution",4);
        list.add(map4);

        Map<String,Object> map5 = new HashMap<>();
        map5.put("proportion","0%");
        map5.put("days",0);
        map5.put("pollution",5);
        list.add(map5);
        dto.setValues(list);

        PieChartOfPollutionLevelDTO dto1 = new PieChartOfPollutionLevelDTO();
        dto1.setTime("2021-11");
        List<Map<String,Object>> list1 = new ArrayList<>();

        Map<String,Object> map11 = new HashMap<>();
        map11.put("proportion","40%");
        map11.put("days",4);
        map11.put("pollution",0);
        list1.add(map11);

        Map<String,Object> map12 = new HashMap<>();
        map12.put("proportion","30%");
        map12.put("days",3);
        map12.put("pollution",1);
        list1.add(map12);

        Map<String,Object> map13 = new HashMap<>();
        map13.put("proportion","30%");
        map13.put("days",3);
        map13.put("pollution",2);
        list1.add(map13);

        Map<String,Object> map14 = new HashMap<>();
        map14.put("proportion","0%");
        map14.put("days",0);
        map14.put("pollution",3);
        list1.add(map14);

        Map<String,Object> map15 = new HashMap<>();
        map15.put("proportion","0%");
        map15.put("days",0);
        map15.put("pollution",4);
        list1.add(map15);

        Map<String,Object> map16 = new HashMap<>();
        map16.put("proportion","0%");
        map16.put("days",0);
        map16.put("pollution",5);
        list1.add(map16);
        dto1.setValues(list1);
        dto1.setTotalDays(10);

        dtos.add(dto);
        dtos.add(dto1);
        return ResultMessage.ok(dtos);
    /**
     * @Description: 获取城市优良天气占比的柱状图下的表格数据
     * @Param: [form]
     * @return: com.moral.constant.ResultMessage
     * @Author: 陈凯裕
     * @Date: 2021/11/22
     */
    @GetMapping("queryBarChatTableOfPollutionLevel")
    public ResultMessage queryBarChatTableOfPollutionLevel(ChartOfPollutionLevelForm form) {
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        //查询数据
        List<MonthlyPollutionLevel> datas = cityAqiDailyService.queryBarChartOfPollutionLevels(form);
        List<BarChartTableOfPollutionLevelVO> vos = new ArrayList<>();
        for (MonthlyPollutionLevel data : datas) {
            BarChartTableOfPollutionLevelVO vo = BarChartTableOfPollutionLevelVO.convert(data);
            vos.add(vo);
        }
        return ResultMessage.ok(vos);
    }

    @GetMapping("provincialRanking")
@@ -221,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);
@@ -242,4 +198,81 @@
        List<Map<String, Object>> response = cityAqiService.rankingDetails(params);
        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);
    }

}