update

jinpengyong

2021-11-02 a4c84773afd8691ee95c48793e53480accab6886

update

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

@@ -22,6 +22,7 @@
import com.moral.util.DateUtils;

import com.moral.util.MathUtils;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -352,25 +353,30 @@
        sortByField(ranks, "aqi");
        //日排名结果
        Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
        dayMap.put("aqi", dayMap.remove("value"));
        result.put("day", dayMap);
        if (!ObjectUtils.isEmpty(dayMap)) {
            dayMap.put("aqi", dayMap.remove("value"));
            result.put("day", dayMap);
        }

        //月排名，按累计综指排
        ranks.removeIf(o -> o.get("compositeIndexMonth") == null);
        sortByField(ranks, "compositeIndexMonth");
        //月排名结果
        Map<String, Object> monthMap = rankByField(ranks, cityCode, "compositeIndexMonth", cityCodes.size());
        monthMap.put("compositeIndex", monthMap.remove("value"));
        result.put("month", monthMap);

        if (!ObjectUtils.isEmpty(monthMap)) {
            monthMap.put("compositeIndex", monthMap.remove("value"));
            result.put("month", monthMap);
        }

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

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