From 3b9302c265ca23c3190b723f1df4ea1dbedf21b5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 17:04:35 +0800
Subject: [PATCH] 排名详情
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 87 ++++++++++++++++++++++++++++++++++++-------
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 18 ++++++---
2 files changed, 85 insertions(+), 20 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 640f34f..c7f4672 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
@@ -11,6 +11,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -45,27 +47,27 @@
}
/**
- * @Description: ���������������6������aqi������
- * @Param: [regionCode]
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/11/1
- */
+ * @Description: ���������������6������aqi������
+ * @Param: [regionCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/1
+ */
@GetMapping("queryByRegionCode")
- public ResultMessage queryByRegionCode(Integer regionCode){
+ public ResultMessage queryByRegionCode(Integer regionCode) {
Map<String, Object> value = cityAqiService.queryCityAqiByRegionCode(regionCode);
return ResultMessage.ok(value);
}
/**
- * @Description: ������������24���������aqi������
- * @Param: [regionCode]
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/11/1
- */
+ * @Description: ������������24���������aqi������
+ * @Param: [regionCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/1
+ */
@GetMapping("query24HoursAQI")
- public ResultMessage query24HoursAQIByRegionCode(Integer regionCode){
+ public ResultMessage query24HoursAQIByRegionCode(Integer regionCode) {
Map<String, Object> datas = cityAqiService.query24HoursAqiByRegionCode(regionCode);
return ResultMessage.ok(datas);
}
@@ -95,4 +97,61 @@
Map<String, Object> response = cityAqiService.provincialRanking(organizationId);
return ResultMessage.ok(response);
}
+
+ @GetMapping("rankingDetails")
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ })
+ public ResultMessage rankingDetails() {
+ List<Map<String, Object>> response = new ArrayList<>();
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("rank", 1);
+ map1.put("cityName", "������");
+ map1.put("aqi", 75);
+ map1.put("compositeIndex", 4.23);
+ map1.put("pm2_5", 55);
+ map1.put("pm10", 74);
+ map1.put("so2", 12);
+ map1.put("no2", 46);
+ map1.put("co", 0.6);
+ map1.put("o3", 19);
+ map1.put("o3_8h", 18);
+ map1.put("primary", "o3");
+
+
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("rank", 2);
+ map2.put("cityName", "������");
+ map2.put("aqi", 72);
+ map2.put("compositeIndex", 3.20);
+ map2.put("pm2_5", 65);
+ map2.put("pm10", 89);
+ map2.put("so2", 23);
+ map2.put("no2", 65);
+ map2.put("co", 0.3);
+ map2.put("o3", 23);
+ map2.put("o3_8h", 24);
+ map2.put("primary", "pm10");
+
+ Map<String, Object> map3 = new HashMap<>();
+ map3.put("rank", 3);
+ map3.put("cityName", "������");
+ map3.put("aqi", 68);
+ map3.put("compositeIndex", 3.56);
+ map3.put("pm2_5", 56);
+ map3.put("pm10", 62);
+ map3.put("so2", 65);
+ map3.put("no2", 54);
+ map3.put("co", 0.6);
+ map3.put("o3", 36);
+ map3.put("o3_8h", 30);
+ map3.put("primary", "so2");
+ response.add(map1);
+ response.add(map2);
+ response.add(map3);
+
+
+
+ return ResultMessage.ok(response);
+ }
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index eb6fc95..03b92c6 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -353,9 +353,11 @@
sortByField(ranks, "aqi");
//���������������
Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
- if (!ObjectUtils.isEmpty(dayMap)) {
- dayMap.put("aqi", dayMap.remove("value"));
+ if (ObjectUtils.isEmpty(dayMap)) {
+ dayMap.put("rank", null);
+ dayMap.put("size", null);
}
+ dayMap.put("aqi", dayMap.remove("value"));
result.put("day", dayMap);
//������������������������������
@@ -363,9 +365,11 @@
sortByField(ranks, "compositeIndexMonth");
//���������������
Map<String, Object> monthMap = rankByField(ranks, cityCode, "compositeIndexMonth", cityCodes.size());
- if (!ObjectUtils.isEmpty(monthMap)) {
- monthMap.put("compositeIndex", monthMap.remove("value"));
+ if (ObjectUtils.isEmpty(monthMap)) {
+ monthMap.put("rank", null);
+ monthMap.put("size", null);
}
+ monthMap.put("compositeIndex", monthMap.remove("value"));
result.put("month", monthMap);
//������������������������������
@@ -373,9 +377,11 @@
//���������������
sortByField(ranks, "compositeIndexYear");
Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
- if(!ObjectUtils.isEmpty(yearMap)){
- yearMap.put("compositeIndex", yearMap.remove("value"));
+ if (ObjectUtils.isEmpty(yearMap)) {
+ yearMap.put("rank", null);
+ yearMap.put("size", null);
}
+ yearMap.put("compositeIndex", yearMap.remove("value"));
result.put("year", yearMap);
//���������������
--
Gitblit v1.8.0