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 | 72 ++++++++++++++++++++++++++++++------ 1 files changed, 60 insertions(+), 12 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 172fbad..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,7 +1,12 @@ package com.moral.api.controller; -import com.moral.api.pojo.dto.dataDisplay.PollutionLevelProportionDTO; +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; @@ -13,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; @@ -87,28 +91,71 @@ return ResultMessage.ok(datas); } - @GetMapping("queryPollutionLevelsForThisYear") - public ResultMessage queryPollutionLevelsForThisYear(Integer regionCode){ - PollutionLevelProportionDTO dto = cityAqiDailyService.queryPollutionLevelsForThisYear(regionCode); - return ResultMessage.ok(dto); + /** + * @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"), @@ -117,7 +164,7 @@ }) public ResultMessage rankingDetails(HttpServletRequest request) { Map<String, Object> params = WebUtils.getParametersStartingWith(request, null); - if (!params.containsKey("type") || !params.containsKey("cityType")) { + 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"); @@ -134,4 +181,5 @@ List<Map<String, Object>> response = cityAqiService.rankingDetails(params); return ResultMessage.ok(response); } + } -- Gitblit v1.8.0