From 03791ab057f15d102bc20b83c687f8a8028a4b8f Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Tue, 28 Dec 2021 13:47:38 +0800 Subject: [PATCH] 行业贡献率update --- screen-api/src/main/java/com/moral/api/controller/AqiController.java | 144 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 122 insertions(+), 22 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/controller/AqiController.java b/screen-api/src/main/java/com/moral/api/controller/AqiController.java index 062c508..c248635 100644 --- a/screen-api/src/main/java/com/moral/api/controller/AqiController.java +++ b/screen-api/src/main/java/com/moral/api/controller/AqiController.java @@ -1,5 +1,12 @@ package com.moral.api.controller; +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; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -11,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; @@ -29,6 +35,8 @@ @Autowired private CityAqiService cityAqiService; + @Autowired + private CityAqiDailyService cityAqiDailyService; @GetMapping("compareO3") @ApiOperation(value = "���������������������������", notes = "���������������������������") @@ -45,41 +53,133 @@ } /** - * @Description: ���������������6������aqi������ - * @Param: [regionCode] - * @return: com.moral.constant.ResultMessage - * @Author: ��������� - * @Date: 2021/11/1 - */ + * @Description: ���������������6������aqi������ + * @Param: [regionCode] + * @return: com.moral.constant.ResultMessage + * @Author: ��������� + * @Date: 2021/11/1 + */ @GetMapping("queryByRegionCode") - public ResultMessage queryByRegionCode(Integer regionCode){ + public ResultMessage queryByRegionCode(Integer regionCode) { Map<String, Object> value = cityAqiService.queryCityAqiByRegionCode(regionCode); return ResultMessage.ok(value); } /** - * @Description: ������������24���������aqi������ - * @Param: [regionCode] - * @return: com.moral.constant.ResultMessage - * @Author: ��������� - * @Date: 2021/11/1 - */ + * @Description: ������������24���������aqi������ + * @Param: [regionCode] + * @return: com.moral.constant.ResultMessage + * @Author: ��������� + * @Date: 2021/11/1 + */ @GetMapping("query24HoursAQI") - public ResultMessage query24HoursAQIByRegionCode(Integer regionCode){ - Map<String, Object> stringObjectMap = cityAqiService.query24HoursAqiByRegionCode(regionCode); - return ResultMessage.ok(stringObjectMap); + public ResultMessage query24HoursAQIByRegionCode(Integer regionCode) { + Map<String, Object> datas = cityAqiService.query24HoursAqiByRegionCode(regionCode); + return ResultMessage.ok(datas); + } + + /** + * @Description: ���������������������aqi��������������������� + * @Param: [RegionCode] + * @return: com.moral.constant.ResultMessage + * @Author: ��������� + * @Date: 2021/11/2 + */ + @GetMapping("queryTodayAqiAndPollutant") + public ResultMessage queryTodayAqiAndPollutant(Integer regionCode) { + Map<String, Object> datas = cityAqiService.queryTodayAqiAndPollutant(regionCode); + return ResultMessage.ok(datas); + } + + /** + * @Description: ������������������������������������������������ + * @Param: [regionCode] + * @return: com.moral.constant.ResultMessage + * @Author: ��������� + * @Date: 2021/11/11 + */ + @GetMapping("queryPieChartOfPollutionLevel") + public ResultMessage queryPieChartOfPollutionLevel(QueryChartOfPollutionLevelForm form) { + //������������������������ + if (!form.valid()) + return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), + ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + + 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") @ApiOperation(value = "������������", notes = "������������") @ApiImplicitParams(value = { - @ApiImplicitParam(name = "organizationId", value = "������id", required = true, paramType = "query", dataType = "Integer") + @ApiImplicitParam(name = "regionCode", value = "������", required = true, paramType = "query", dataType = "Integer") }) - public ResultMessage provincialRanking(Integer organizationId) { - if (ObjectUtils.isEmpty(organizationId)) { + public ResultMessage provincialRanking(Integer regionCode) { + if (ObjectUtils.isEmpty(regionCode)) { return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); } - Map<String, Object> response = cityAqiService.provincialRanking(organizationId); + Map<String, Object> response = cityAqiService.provincialRanking(regionCode); return ResultMessage.ok(response); } + + @GetMapping("rankingDetails") + @ApiOperation(value = "������������", notes = "������������") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "regionCode", value = "������", required = true, paramType = "query", dataType = "Integer"), + @ApiImplicitParam(name = "type", value = "������������������������������today������������hour���������day���������month���������year���������������custom", required = true, paramType = "query", dataType = "String"), + @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"), + }) + public ResultMessage rankingDetails(HttpServletRequest request) { + Map<String, Object> params = WebUtils.getParametersStartingWith(request, null); + if (!params.containsKey("type") || !params.containsKey("cityType") || !params.containsKey("regionCode")) { + return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + } + Object type = params.get("type"); + if ("hour".equals(type) || "day".equals(type) || "month".equals(type) || "year".equals(type)) { + if (!params.containsKey("time")) { + return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + } + } + if ("custom".equals(type)) { + if (!params.containsKey("start") || !params.containsKey("end")) { + return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + } + } + List<Map<String, Object>> response = cityAqiService.rankingDetails(params); + return ResultMessage.ok(response); + } + } -- Gitblit v1.8.0