From ba9c4bca1bdf36f827ab258222d92c885ff890db Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 05 Sep 2023 08:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/CityAqiMonthlyService.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/CityAqiMonthlyService.java b/screen-api/src/main/java/com/moral/api/service/CityAqiMonthlyService.java
index 83688d4..c40284c 100644
--- a/screen-api/src/main/java/com/moral/api/service/CityAqiMonthlyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/CityAqiMonthlyService.java
@@ -5,6 +5,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -17,12 +18,23 @@
public interface CityAqiMonthlyService extends IService<CityAqiMonthly> {
/**
- * @Description: ������������������������������������
- * @Param: [regionCode, startDate, endDate]
- * @return: java.util.List<com.moral.api.entity.CityAqiMonthly>
- * @Author: ���������
- * @Date: 2022/1/17
- */
- List<CityAqiMonthly> getCityAqiMonthByRegionCodeAndTime(Integer regionCode, Date startDate,Date endDate);
+ * @Description: ������������������������������������
+ * @Param: [regionCode, startDate, endDate]
+ * @return: java.util.List<com.moral.api.entity.CityAqiMonthly>
+ * @Author: ���������
+ * @Date: 2022/1/17
+ */
+ List<CityAqiMonthly> getCityAqiMonthByRegionCodeAndTime(Integer regionCode, Date startDate, Date endDate);
+ /**
+ * @Description: ������������������������������������������
+ * @Param: [regionCode, time]
+ * @return: com.moral.api.entity.CityAqiMonthly
+ * @Author: ���������
+ * @Date: 2022/3/14
+ */
+ CityAqiMonthly getCityAqiMonthByRegionCodeAndTime(Integer regionCode, Date time);
+
+ //���������������������������������������������������
+ Map<String, Object> airQualityRankingAnnouncement(Integer regionCode, Date time);
}
--
Gitblit v1.8.0