From 30c76f1f25ddf6437014ea47bdc206cf0e288ec7 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 03 Nov 2021 14:23:09 +0800 Subject: [PATCH] screen-common 修改AQI工具类代码 --- screen-api/src/main/java/com/moral/api/controller/AqiController.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 1 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 0246729..c7f4672 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 @@ -5,11 +5,14 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; 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; @@ -34,7 +37,7 @@ @ApiImplicitParams(value = { @ApiImplicitParam(name = "regionCode", value = "������", required = true, paramType = "query", dataType = "String") }) - public ResultMessage MeasuredCompareForecast(HttpServletRequest request) { + public ResultMessage measuredCompareForecast(HttpServletRequest request) { Map<String, Object> params = WebUtils.getParametersStartingWith(request, null); if (!params.containsKey("regionCode") || !params.containsKey("time")) { return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); @@ -42,4 +45,113 @@ List<Map<String, Object>> response = cityAqiService.measuredCompareForecastOfO3(params); return ResultMessage.ok(response); } + + /** + * @Description: ���������������6������aqi������ + * @Param: [regionCode] + * @return: com.moral.constant.ResultMessage + * @Author: ��������� + * @Date: 2021/11/1 + */ + @GetMapping("queryByRegionCode") + 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 + */ + @GetMapping("query24HoursAQI") + 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); + } + + @GetMapping("provincialRanking") + @ApiOperation(value = "������������", notes = "������������") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "organizationId", value = "������id", required = true, paramType = "query", dataType = "Integer") + }) + public ResultMessage provincialRanking(Integer organizationId) { + if (ObjectUtils.isEmpty(organizationId)) { + return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + } + Map<String, Object> response = cityAqiService.provincialRanking(organizationId); + return ResultMessage.ok(response); + } + + @GetMapping("rankingDetails") + @ApiOperation(value = "������������", notes = "������������") + @ApiImplicitParams(value = { + }) + public ResultMessage rankingDetails() { + List<Map<String, Object>> response = new ArrayList<>(); + Map<String, Object> map1 = new HashMap<>(); + map1.put("rank", 1); + map1.put("cityName", "������"); + map1.put("aqi", 75); + map1.put("compositeIndex", 4.23); + map1.put("pm2_5", 55); + map1.put("pm10", 74); + map1.put("so2", 12); + map1.put("no2", 46); + map1.put("co", 0.6); + map1.put("o3", 19); + map1.put("o3_8h", 18); + map1.put("primary", "o3"); + + + Map<String, Object> map2 = new HashMap<>(); + map2.put("rank", 2); + map2.put("cityName", "������"); + map2.put("aqi", 72); + map2.put("compositeIndex", 3.20); + map2.put("pm2_5", 65); + map2.put("pm10", 89); + map2.put("so2", 23); + map2.put("no2", 65); + map2.put("co", 0.3); + map2.put("o3", 23); + map2.put("o3_8h", 24); + map2.put("primary", "pm10"); + + Map<String, Object> map3 = new HashMap<>(); + map3.put("rank", 3); + map3.put("cityName", "������"); + map3.put("aqi", 68); + map3.put("compositeIndex", 3.56); + map3.put("pm2_5", 56); + map3.put("pm10", 62); + map3.put("so2", 65); + map3.put("no2", 54); + map3.put("co", 0.6); + map3.put("o3", 36); + map3.put("o3_8h", 30); + map3.put("primary", "so2"); + response.add(map1); + response.add(map2); + response.add(map3); + + + + return ResultMessage.ok(response); + } } -- Gitblit v1.8.0