jinpengyong
2021-11-03 2e5ad6b6a97104693564ebc9108f58642386a362
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -312,9 +312,8 @@
            if (!ObjectUtils.isEmpty(one)) {
                String value = one.getValue();
                Map<String, Object> valueMap = JSONObject.parseObject(value, Map.class);
                rankMap.put("aqi", valueMap.get("aqi"));
                rankMap.put("AQI", valueMap.get("AQI"));
            }
            //2.本月累计综合指数计算,截止到昨日
            queryWrapper.clear();
@@ -353,15 +352,15 @@
        }
        //日排名,按aqi排序
        ranks.removeIf(o -> o.get("aqi") == null);
        sortByField(ranks, "aqi");
        ranks.removeIf(o -> o.get("AQI") == null);
        sortByField(ranks, "AQI");
        //日排名结果
        Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
        Map<String, Object> dayMap = rankByField(ranks, cityCode, "AQI", cityCodes.size());
        if (ObjectUtils.isEmpty(dayMap)) {
            dayMap.put("rank", null);
            dayMap.put("size", null);
        }
        dayMap.put("aqi", dayMap.remove("value"));
        dayMap.put("AQI", dayMap.remove("value"));
        result.put("day", dayMap);
        //月排名,按累计综指排