From 3d593b39648ff583a255765f76760768d6ba5f55 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 23 Dec 2021 14:32:14 +0800
Subject: [PATCH] 正式库city_aqi，city_weather,history_aqi第三方数据存入开发库
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 158 +++++++++++++++++++++++++++++++---------------------
1 files changed, 93 insertions(+), 65 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 c7f4672..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,10 +18,7 @@
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;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
@@ -31,6 +35,8 @@
@Autowired
private CityAqiService cityAqiService;
+ @Autowired
+ private CityAqiDailyService cityAqiDailyService;
@GetMapping("compareO3")
@ApiOperation(value = "���������������������������", notes = "���������������������������")
@@ -73,85 +79,107 @@
}
/**
- * @Description: ���������������������aqi���������������������
- * @Param: [RegionCode]
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/11/2
- */
+ * @Description: ���������������������aqi���������������������
+ * @Param: [RegionCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/2
+ */
@GetMapping("queryTodayAqiAndPollutant")
- public ResultMessage queryTodayAqiAndPollutant(Integer regionCode){
+ 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() {
- 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);
-
-
-
+ 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