From 6716f456e8e01ea50ef26c71cc6c81b54c6573a9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 11 Feb 2022 14:27:42 +0800
Subject: [PATCH] screen-api 修改优良天气变化率分析单位
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 254 +++++++++++++++++++++++++++++++-------------------
1 files changed, 157 insertions(+), 97 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 8d3716f..f89d725 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,31 +1,41 @@
package com.moral.api.controller;
-import com.moral.api.pojo.dto.dataDisplay.PieChartOfPollutionLevelDTO;
-import com.moral.api.pojo.form.aqi.QueryPieChartOfPollutionLevelForm;
+import com.moral.api.config.properties.SpecialCitiesProperties;
+import com.moral.api.entity.SysArea;
+import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;
+import com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent;
+import com.moral.api.pojo.dto.cityAQI.DataPercentRange;
+import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
+import com.moral.api.pojo.form.aqi.*;
+import com.moral.api.pojo.vo.cityAQI.AirQualityComparisonVO;
+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.service.CityAqiDailyService;
+import com.moral.api.service.CityAqiYearlyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
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;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotNull;
import com.moral.api.service.CityAqiService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
+import sun.security.util.Resources_sv;
@RestController
@RequestMapping("/aqi")
@@ -99,105 +109,58 @@
* @Date: 2021/11/11
*/
@GetMapping("queryPieChartOfPollutionLevel")
- public ResultMessage queryPieChartOfPollutionLevel(QueryPieChartOfPollutionLevelForm form) {
+ public ResultMessage queryPieChartOfPollutionLevel(ChartOfPollutionLevelForm 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);
+ PieChartOfPollutionLevelVO VO = cityAqiDailyService.queryPieChartOfPollutionLevels(form);
+ return ResultMessage.ok(VO);
}
- @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);
+ /**
+ * @Description: ������������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/22
+ */
+ @GetMapping("queryBarChartOfPollutionLevel")
+ public ResultMessage queryBarChartOfPollutionLevel(ChartOfPollutionLevelForm 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);
- 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);
+ /**
+ * @Description: ������������������������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/22
+ */
+ @GetMapping("queryBarChatTableOfPollutionLevel")
+ public ResultMessage queryBarChatTableOfPollutionLevel(ChartOfPollutionLevelForm 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")
@@ -221,7 +184,7 @@
@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"),
+ @ApiImplicitParam(name = "cityType", value = "������������������������������province������������������city���2+28���������������28", required = true, paramType = "query", dataType = "String"),
})
public ResultMessage rankingDetails(HttpServletRequest request) {
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
@@ -242,4 +205,101 @@
List<Map<String, Object>> response = cityAqiService.rankingDetails(params);
return ResultMessage.ok(response);
}
+
+ /**
+ * @Description: ������������������������������������������������
+ * @Param: [regionCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/12/30
+ */
+ @GetMapping("queryAreaPollutionLevel")
+ public ResultMessage queryAreaPollutionLevel(AreaPollutionLevelForm form) {
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ //������������������
+ List<CityPollutionLevel> datas = cityAqiDailyService.queryAreaPollutionLevel(form);
+ //������������
+ return ResultMessage.ok(datas);
+ }
+
+ /**
+ * @Description: ������26+2������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/12/31
+ */
+ @GetMapping("qeury28CitiesPollutionLevel")
+ public ResultMessage query28CitiesPollutionLevel(SpecialCitiesPollutionLevelForm form) {
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ //������������������
+ List<CityPollutionLevel> datas = cityAqiDailyService.querySpecialCitiesPollutionLevel(form);
+ //������������
+ return ResultMessage.ok(datas);
+ }
+
+ /**
+ * @Description: ���������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/1/7
+ */
+ @GetMapping("queryProvinceCitiesPollutionLevel")
+ public ResultMessage queryProvinceCitiesPollutionLevel(ProvinceCitiesPollutionLevelForm form) {
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ //������������������
+ List<CityPollutionLevel> datas = cityAqiDailyService.queryProvinceCitiesPollutionLevel(form);
+ //������������
+ return ResultMessage.ok(datas);
+ }
+
+ /**
+ * @Description: ������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/1/12
+ */
+ @GetMapping("queryAirQualityComparison")
+ public ResultMessage queryAirQualityComparison(AirQualityComparisonForm form){
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ //������������
+ List<AirQualityComparisonVO> datas = cityAqiService.queryAirQualityComparison(form);
+ //������������
+ return ResultMessage.ok(datas);
+ }
+
+ @Autowired
+ SpecialCitiesProperties specialCitiesProperties;
+ @Autowired
+ CityAqiYearlyService cityAqiYearlyService;
+ /**
+ * @Description: ������������������������
+ * @Param: [year, cityCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/2/10
+ */
+ @GetMapping("queryPollutionLevelAnalysis")
+ public ResultMessage queryPollutionLevelAnalysis( String year, Integer cityCode){
+ if(year==null||cityCode==null)
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ Map<String, DataPercentRange> result = cityAqiYearlyService.analysisPollutionLevel(year, cityCode);
+ return ResultMessage.ok(result);
+ }
+
}
--
Gitblit v1.8.0