screen-api

kaiyu

2022-03-24 a827480e5e74cb6550c5f7b842bccac3023c5bdc

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

@@ -14,6 +14,7 @@
import com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent;
import com.moral.api.pojo.form.aqi.AirQualityComparisonForm;
import com.moral.api.pojo.vo.cityAQI.AirQualityComparisonVO;
import com.moral.api.pojo.vo.cityAQI.CityAreaRangeVO;
import com.moral.api.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -83,6 +84,9 @@

    @Autowired
    private HistoryHourlyService historyHourlyService;

    @Autowired
    SpecialCitiesProperties citiesProperties;

    @Autowired
    private SysAreaMapper sysAreaMapper;
@@ -372,7 +376,7 @@
                }
            });

            //今日累计O3_8H计算,取每小时O3_8H最大值
            //今日累计O3_8H计算,取每小时O3——8H最大值
            if (!ObjectUtils.isEmpty(doubles)) {
                dataMap.put("O3_8H", Collections.max(doubles));
            }
@@ -1309,8 +1313,7 @@
    private List<SysArea> getSysAreasByRegionType(String regionType, Integer regionCode) {
        List<SysArea> areas;
        if (regionType.equals(Constants.TWENTY_EIGHT_CITIES)) {
            SpecialCitiesProperties properties = new SpecialCitiesProperties();
            areas = properties.getTwentyEightCities();
            areas = citiesProperties.getTwentyEightCities();
        } else {
            areas = sysAreaService.getChildren(regionCode);
        }