省内倒数排名数据结构update

jinpengyong

2021-11-02 99beb83b1ed149b8b4445e828b55959fb68bee91

省内倒数排名数据结构update

 screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java

@@ -355,8 +355,8 @@
        Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
        if (!ObjectUtils.isEmpty(dayMap)) {
            dayMap.put("aqi", dayMap.remove("value"));
            result.put("day", dayMap);
        }
        result.put("day", dayMap);

        //月排名，按累计综指排
        ranks.removeIf(o -> o.get("compositeIndexMonth") == null);
@@ -365,18 +365,18 @@
        Map<String, Object> monthMap = rankByField(ranks, cityCode, "compositeIndexMonth", cityCodes.size());
        if (!ObjectUtils.isEmpty(monthMap)) {
            monthMap.put("compositeIndex", monthMap.remove("value"));
            result.put("month", monthMap);
        }
        result.put("month", monthMap);

        //年排名，按累计综指排
        sortByField(ranks, "compositeIndexYear");
        //年排名结果
        sortByField(ranks, "compositeIndexYear");
        Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
        if (!ObjectUtils.isEmpty(yearMap)) {
        if(!ObjectUtils.isEmpty(yearMap)){
            yearMap.put("compositeIndex", yearMap.remove("value"));
            result.put("year", yearMap);
        }
        result.put("year", yearMap);

        //时间，昨日
        result.put("time", DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN));