From 991cc64bcc9b869be5f8e9abe24f530d4fda6240 Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Thu, 18 Nov 2021 09:48:50 +0800 Subject: [PATCH] 修改方法名 --- screen-api/src/main/java/com/moral/api/controller/AqiController.java | 126 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 117 insertions(+), 9 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..8d3716f 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,9 @@ package com.moral.api.controller; -import com.moral.api.pojo.dto.dataDisplay.PollutionLevelProportionDTO; +import com.moral.api.pojo.dto.dataDisplay.PieChartOfPollutionLevelDTO; +import com.moral.api.pojo.form.aqi.QueryPieChartOfPollutionLevelForm; import com.moral.api.service.CityAqiDailyService; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -13,6 +15,8 @@ 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; @@ -87,28 +91,132 @@ return ResultMessage.ok(datas); } - @GetMapping("queryPollutionLevelsForThisYear") - public ResultMessage queryPollutionLevelsForThisYear(Integer regionCode){ - PollutionLevelProportionDTO dto = cityAqiDailyService.queryPollutionLevelsForThisYear(regionCode); + /** + * @Description: ������������������������������������������������ + * @Param: [regionCode] + * @return: com.moral.constant.ResultMessage + * @Author: ��������� + * @Date: 2021/11/11 + */ + @GetMapping("queryPieChartOfPollutionLevel") + public ResultMessage queryPieChartOfPollutionLevel(QueryPieChartOfPollutionLevelForm 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); + } + + @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); + + 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); } @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 +225,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"); -- Gitblit v1.8.0