From b2f2adab687a8d5d49fcc479f4857ec303e4b9f0 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Mar 2022 10:35:08 +0800
Subject: [PATCH] screen-api 判断优良天非空
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 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 f89d725..fdfeaca 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
@@ -2,15 +2,9 @@
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.dto.cityAQI.*;
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.pojo.vo.cityAQI.*;
import com.moral.api.service.CityAqiDailyService;
import com.moral.api.service.CityAqiYearlyService;
@@ -47,6 +41,10 @@
private CityAqiService cityAqiService;
@Autowired
private CityAqiDailyService cityAqiDailyService;
+ @Autowired
+ SpecialCitiesProperties specialCitiesProperties;
+ @Autowired
+ CityAqiYearlyService cityAqiYearlyService;
@GetMapping("compareO3")
@ApiOperation(value = "���������������������������", notes = "���������������������������")
@@ -282,10 +280,6 @@
return ResultMessage.ok(datas);
}
- @Autowired
- SpecialCitiesProperties specialCitiesProperties;
- @Autowired
- CityAqiYearlyService cityAqiYearlyService;
/**
* @Description: ������������������������
* @Param: [year, cityCode]
@@ -302,4 +296,23 @@
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());
+ }
+ List<Map<String, Object>> resultList = cityAqiService.momData(regionCode, size, current, orgId);
+ return ResultMessage.ok(resultList);
+ }
+
}
--
Gitblit v1.8.0