经纬度实体类，计算中心点工具类，修改热力图接口经纬度顺序

lizijie

2021-12-10 0359860dbc5de19f3d099ff549af0b4c48a08221

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

@@ -1,7 +1,10 @@
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.MonthlyPollutionLevel;
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;
@@ -15,8 +18,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

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

import javax.servlet.http.HttpServletRequest;

@@ -97,14 +99,44 @@
     * @Date: 2021/11/11
     */
    @GetMapping("queryPieChartOfPollutionLevel")
    public ResultMessage queryPieChartOfPollutionLevel(QueryPieChartOfPollutionLevelForm form) {
    public ResultMessage queryPieChartOfPollutionLevel(QueryChartOfPollutionLevelForm 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("queryBarChartOfPollutionLevel")
    public ResultMessage queryBarChartOfPollutionLevel(QueryChartOfPollutionLevelForm 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);

    }

    @GetMapping("queryBarChatTableOfPollutionLevel")
    public ResultMessage queryBarChatTableOfPollutionLevel(QueryChartOfPollutionLevelForm 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")
@@ -149,4 +181,5 @@
        List<Map<String, Object>> response = cityAqiService.rankingDetails(params);
        return ResultMessage.ok(response);
    }

}