From 35ca4aa6343baec6c2c949cac7ab682c09a371e3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 11 Jul 2023 13:48:46 +0800
Subject: [PATCH] chore: 提交测试
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 184 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 148 insertions(+), 36 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 a9c210c..2cc538b 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,20 +1,20 @@
package com.moral.api.controller;
-import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;
-import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
-import com.moral.api.pojo.form.aqi.AreaPollutionLevelForm;
-import com.moral.api.pojo.form.aqi.SpecialCitiesPollutionLevelForm;
-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.ChartOfPollutionLevelForm;
+import com.moral.api.config.properties.SpecialCitiesProperties;
+import com.moral.api.entity.SysArea;
+import com.moral.api.pojo.dto.cityAQI.*;
+import com.moral.api.pojo.form.aqi.*;
+import com.moral.api.pojo.vo.cityAQI.*;
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.format.annotation.DateTimeFormat;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
@@ -24,6 +24,7 @@
import java.util.*;
import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotNull;
import com.moral.api.service.CityAqiService;
import com.moral.constant.ResponseCodeEnum;
@@ -40,6 +41,10 @@
private CityAqiService cityAqiService;
@Autowired
private CityAqiDailyService cityAqiDailyService;
+ @Autowired
+ SpecialCitiesProperties specialCitiesProperties;
+ @Autowired
+ CityAqiYearlyService cityAqiYearlyService;
@GetMapping("compareO3")
@ApiOperation(value = "���������������������������", notes = "���������������������������")
@@ -113,14 +118,14 @@
}
/**
- * @Description: ������������������������������������������������
- * @Param: [form]
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/11/22
- */
+ * @Description: ������������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/22
+ */
@GetMapping("queryBarChartOfPollutionLevel")
- public ResultMessage queryBarChartOfPollutionLevel(ChartOfPollutionLevelForm form){
+ public ResultMessage queryBarChartOfPollutionLevel(ChartOfPollutionLevelForm form) {
//������������������������
if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -134,14 +139,14 @@
}
/**
- * @Description: ������������������������������������������������������������
- * @Param: [form]
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/11/22
- */
+ * @Description: ������������������������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/22
+ */
@GetMapping("queryBarChatTableOfPollutionLevel")
- public ResultMessage queryBarChatTableOfPollutionLevel(ChartOfPollutionLevelForm form){
+ public ResultMessage queryBarChatTableOfPollutionLevel(ChartOfPollutionLevelForm form) {
//������������������������
if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -200,14 +205,14 @@
}
/**
- * @Description: ������������������������������������������������
- * @Param: [regionCode]
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/12/30
- */
+ * @Description: ������������������������������������������������
+ * @Param: [regionCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/12/30
+ */
@GetMapping("queryAreaPollutionLevel")
- public ResultMessage queryAreaPollutionLevel(AreaPollutionLevelForm form){
+ public ResultMessage queryAreaPollutionLevel(AreaPollutionLevelForm form) {
//������������������������
if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -219,14 +224,14 @@
}
/**
- * @Description: ������26+2������������������������
- * @Param: [form]
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/12/31
- */
+ * @Description: ������26+2������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/12/31
+ */
@GetMapping("qeury28CitiesPollutionLevel")
- public ResultMessage qeury28CitiesPollutionLevel(SpecialCitiesPollutionLevelForm form){
+ public ResultMessage query28CitiesPollutionLevel(SpecialCitiesPollutionLevelForm form) {
//������������������������
if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -237,4 +242,111 @@
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);
+ }
+
+ /**
+ * @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);
+ }
+
+ @GetMapping("queryComplianceDaysAnalysis")
+ public ResultMessage queryComplianceDaysAnalysis( String year, Integer cityCode){
+ if(year==null||cityCode==null)
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ List<ComplianceDaysDTO> dtos = cityAqiYearlyService.analysisComplianceDays(year, cityCode);
+ return ResultMessage.ok(ComplianceDaysVO.convert(dtos));
+ }
+
+ @GetMapping("momDate")
+ public ResultMessage momDate(Integer regionCode, Integer size, Integer current, Integer orgId){
+ if(regionCode==null || size==null || current==null){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> result = cityAqiService.momData(regionCode, size, current, orgId);
+ return ResultMessage.ok(result);
+ }
+
+ /**
+ * @Description: ������������������������������ ������7
+ * @Param: [regionCode, time]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/3/16
+ */
+ @GetMapping("cityAreaRange")
+ public ResultMessage cityAreaRange(Integer regionCode,@DateTimeFormat(pattern = "yyyy-MM-dd") Date time){
+ if(regionCode==null || time==null){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ List<CityAreaRangeVO> vos = cityAqiDailyService.cityAreaRange(regionCode,time);
+ return ResultMessage.ok(vos);
+ }
+
+ /**
+ *@Description: ���������������
+ *@Param: [regionCode]
+ *@return: com.moral.constant.ResultMessage
+ *@Author: lizijie
+ *@Date: 2022/3/16 16:54
+ **/
+ @GetMapping("countyData")
+ public ResultMessage countyData(Integer regionCode){
+ if(regionCode==null){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> resultMap = cityAqiService.countyData(regionCode);
+ return ResultMessage.ok(resultMap);
+ }
+
}
--
Gitblit v1.8.0