From eca8731f8626a8baf4d472de31da160e5f77abc7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 30 Dec 2021 16:56:12 +0800
Subject: [PATCH] 获取多设备公有因子,排序

---
 screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 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 aff00f4..7dd6cef 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
@@ -2,11 +2,14 @@
 
 import com.moral.api.entity.CityAqiDaily;
 import com.baomidou.mybatisplus.extension.service.IService;
+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.vo.cityAQI.PieChartOfPollutionLevelVO;
-import com.moral.api.pojo.form.aqi.QueryChartOfPollutionLevelForm;
+import com.moral.api.pojo.form.aqi.ChartOfPollutionLevelForm;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,7 +28,7 @@
             * @Author: ���������
             * @Date: 2021/11/9
             */
-    PieChartOfPollutionLevelVO queryPieChartOfPollutionLevels(QueryChartOfPollutionLevelForm form);
+    PieChartOfPollutionLevelVO queryPieChartOfPollutionLevels(ChartOfPollutionLevelForm form);
 
     /**
     * @Description: ������������������������������������������������������������
@@ -34,5 +37,23 @@
             * @Author: ���������
             * @Date: 2021/11/22
             */
-    List<MonthlyPollutionLevel> queryBarChartOfPollutionLevels(QueryChartOfPollutionLevelForm form);
+    List<MonthlyPollutionLevel> queryBarChartOfPollutionLevels(ChartOfPollutionLevelForm form);
+
+    /**
+     *@Description: ������������������������������������������
+     *@Param: [map]
+     *@return: java.util.Map<java.lang.String,java.lang.Object>
+     *@Author: lizijie
+     *@Date: 2021/11/23 14:42
+     **/
+    Map<String,Map<String,Object>> oneYearsData(Map map);
+
+    /**
+    * @Description: ������������������������������������������������
+            * @Param: [AreaPollutionLevelForm]
+            * @return: java.util.List<com.moral.api.pojo.dto.cityAQI.CityPollutionLevel>
+            * @Author: ���������
+            * @Date: 2021/12/30
+            */
+    List<CityPollutionLevel> queryAreaPollutionLevel(AreaPollutionLevelForm form);
 }

--
Gitblit v1.8.0