From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

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

diff --git a/screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java b/screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java
index 2df895a..57ed959 100644
--- a/screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java
@@ -6,6 +6,7 @@
 import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;
 import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
 import com.moral.api.pojo.form.aqi.*;
+import com.moral.api.pojo.vo.cityAQI.CityAreaRangeVO;
 import com.moral.api.pojo.vo.cityAQI.PieChartOfPollutionLevelVO;
 
 import java.util.Date;
@@ -94,5 +95,23 @@
             */
     CityPollutionLevel calculateDaysByTimeAndSysArea(SysArea area, Date startDate, Date endDate);
 
+    /**
+    * @Description: ������������������������
+            * @Param: [regionCode, time]
+            * @return: java.lang.String
+            * @Author: ���������
+            * @Date: 2022/3/11
+            */
+    List<String> airQualityBulletin(String regionCode,Date time);
+
+    /**
+     * @Description: ���������������������������������������������������(������7������)
+     * @Param: [regionCode, time]
+     * @return: java.util.List<com.moral.api.pojo.vo.cityAQI.CityAreaRangeVO>
+     * @Author: ���������
+     * @Date: 2022/3/17
+     */
+    List<CityAreaRangeVO> cityAreaRange(Integer regionCode, Date time);
+
 
 }

--
Gitblit v1.8.0