blame | history | patch | commit | commitdiff | ignore whitespace
kaiyu
2021-11-12 6a8b22c541448dbe15eb1b046dbf456131c2f325 
 screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java


@@ -346,7 +346,12 @@


            sixParamMap.put(Constants.SENSOR_CODE_O3, dataMap.get("O3"));


            AQI aqi = AQIUtils.dailyAQI(sixParamMap);


            dataMap.put("AQI", aqi.getAQIValue());


            dataMap.put("primaryPollutant", aqi.getPrimaryPollutantNames());


            List<String> primaryPollutantNames = aqi.getPrimaryPollutantNames();


            String primaryPollutant = "";


            if (!ObjectUtils.isEmpty(primaryPollutantNames)) {


                primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));


            }


            dataMap.put("primaryPollutant", primaryPollutant);




            //今日累计综合指数计算,O3分综指用O3_8H计算


            Map<String, Object> compositeIndexMap = new HashMap<>(dataMap);


@@ -379,6 +384,12 @@


        List<Map<String, Object>> hourData = cityAqiMapper.selectMaps(wrapper);


        for (Map<String, Object> hourDatum : hourData) {


            Map<String, Object> value = JSONObject.parseObject((String) hourDatum.get("value"), Map.class);


            List<String> primaryPollutantNames = (List<String>) value.get("primaryPollutant");


            String primaryPollutant = "";


            if (!ObjectUtils.isEmpty(primaryPollutantNames)) {


                primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));


            }


            value.put("primaryPollutant", primaryPollutant);


            value.remove("pubtime");


            value.remove("rank");


            result.add(value);


@@ -400,6 +411,12 @@


        List<Map<String, Object>> dayData = cityAqiDailyService.listMaps(wrapper);


        for (Map<String, Object> dayDatum : dayData) {


            Map<String, Object> value = JSONObject.parseObject((String) dayDatum.get("value"), Map.class);


            List<String> primaryPollutantNames = (List<String>) value.get("primaryPollutant");


            String primaryPollutant = "";


            if (!ObjectUtils.isEmpty(primaryPollutantNames)) {


                primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));


            }


            value.put("primaryPollutant", primaryPollutant);


            //城市名


            QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>();


            queryWrapper.select("area_name")


@@ -949,6 +966,4 @@


        }


        return result;


    }






}