From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:13:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/java/com/moral/api/service/CityAqiYearlyService.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/CityAqiYearlyService.java b/screen-api/src/main/java/com/moral/api/service/CityAqiYearlyService.java
index bcd1cba..2711271 100644
--- a/screen-api/src/main/java/com/moral/api/service/CityAqiYearlyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/CityAqiYearlyService.java
@@ -2,9 +2,12 @@
 
 import com.moral.api.entity.CityAqiYearly;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.pojo.dto.cityAQI.ComplianceDaysDTO;
+import com.moral.api.pojo.dto.cityAQI.DataPercentRange;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -23,4 +26,22 @@
             * @Date: 2022/1/17
             */
     List<CityAqiYearly> getCityAqiYearlyByRegionCodeAndTime(Integer regionCode, Date startDate, Date endDate);
+
+    /** 
+    * @Description: ������������������������
+            * @Param: [year, cityCode]
+            * @return: java.util.Map<java.lang.String,com.moral.api.pojo.dto.cityAQI.DataPercentRange>
+            * @Author: ���������
+            * @Date: 2022/2/11
+            */ 
+    Map<String, DataPercentRange> analysisPollutionLevel(String year, Integer cityCode);
+
+    /**
+    * @Description: ������������������������
+            * @Param: [year, cityCode]
+            * @return: java.util.List<com.moral.api.pojo.dto.cityAQI.ComplianceDaysDTO>
+            * @Author: ���������
+            * @Date: 2022/2/25
+            */
+    List<ComplianceDaysDTO>  analysisComplianceDays(String year, Integer cityCode);
 }

--
Gitblit v1.8.0