From 547b51661fefe8d7b88640b29a60db8874f5efac Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 14 Mar 2022 16:27:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/CityAqiService.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/CityAqiService.java b/screen-api/src/main/java/com/moral/api/service/CityAqiService.java
index 7fed2ca..832ef00 100644
--- a/screen-api/src/main/java/com/moral/api/service/CityAqiService.java
+++ b/screen-api/src/main/java/com/moral/api/service/CityAqiService.java
@@ -5,6 +5,8 @@
import com.moral.api.entity.CityAqi;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.pojo.form.aqi.AirQualityComparisonForm;
+import com.moral.api.pojo.vo.cityAQI.AirQualityComparisonVO;
/**
* <p>
@@ -29,7 +31,7 @@
Map<String, Object> queryCityAqiByRegionCode(Integer regionCode);
//������������
- Map<String, Object> provincialRanking(Integer organizationId);
+ Map<String, Object> provincialRanking(Integer regionCode);
/**
* @Description: ���������������������24���������aqi
@@ -52,4 +54,22 @@
//������������������������������
List<Map<String, Object>> rankingDetails(Map<String, Object> params);
+
+ /**
+ * @Description: ������������������������������������
+ * @Param: [form]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2022/1/14
+ */
+ List<AirQualityComparisonVO> queryAirQualityComparison(AirQualityComparisonForm form);
+
+ /**
+ *@Description: ������������������������
+ *@Param: [regionCode, size, current]
+ *@return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+ *@Author: lizijie
+ *@Date: 2022/3/10 15:49
+ **/
+ List<Map<String,Object>> momData(Integer regionCode, Integer size, Integer current, Integer orgId);
}
--
Gitblit v1.8.0