From 6cc2a1d726e1019079b6d3fa74599426a359c001 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 14:55:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AqiController.java b/screen-api/src/main/java/com/moral/api/controller/AqiController.java
index 062c508..640f34f 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AqiController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AqiController.java
@@ -66,8 +66,21 @@
*/
@GetMapping("query24HoursAQI")
public ResultMessage query24HoursAQIByRegionCode(Integer regionCode){
- Map<String, Object> stringObjectMap = cityAqiService.query24HoursAqiByRegionCode(regionCode);
- return ResultMessage.ok(stringObjectMap);
+ Map<String, Object> datas = cityAqiService.query24HoursAqiByRegionCode(regionCode);
+ return ResultMessage.ok(datas);
+ }
+
+ /**
+ * @Description: ���������������������aqi���������������������
+ * @Param: [RegionCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/2
+ */
+ @GetMapping("queryTodayAqiAndPollutant")
+ public ResultMessage queryTodayAqiAndPollutant(Integer regionCode){
+ Map<String, Object> datas = cityAqiService.queryTodayAqiAndPollutant(regionCode);
+ return ResultMessage.ok(datas);
}
@GetMapping("provincialRanking")
--
Gitblit v1.8.0