update

jinpengyong

2022-01-20 0bb98d4377e5b894a2338b7726846b978450e187

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

@@ -23,6 +23,7 @@
import org.springframework.util.ObjectUtils;
import org.springframework.web.client.RestTemplate;

import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -61,7 +62,7 @@
        //存入数据库是time字段实际时间
        Date dataTime = DateUtils.addHours(time, -1);
        Date start = null;
        if (DateUtils.getHour(time) >= 8) {
        if (DateUtils.getHour(time) >= 8 || DateUtils.getHour(time) == 0) {
            start = DateUtils.addHours(time, -8);
        }

@@ -70,7 +71,10 @@
        wrapper.select("city_code", "city_id").eq("is_delete", Constants.NOT_DELETE);
        List<CityConfigAqi> list = cityConfigAqiService.list(wrapper);

        List<CityAqi> cityAqiList = new ArrayList<>();

        for (CityConfigAqi cityConfigAqi : list) {
            CityAqi cityAqi = new CityAqi();
            Integer cityCode = cityConfigAqi.getCityCode();
            Map<String, Object> data;
            try {
@@ -112,7 +116,7 @@
                params.put("value", JSONObject.toJSONString(aqi));
                cityAqis.add(params);
                if (cityAqis.size() >= 6) {
                    OptionalDouble average = cityAqis.parallelStream().flatMapToDouble(v -> {
                    OptionalDouble average = cityAqis.stream().flatMapToDouble(v -> {
                        Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
                        double o3 = Double.parseDouble(dataValue.get("O3").toString());
                        return DoubleStream.of(o3);
@@ -142,13 +146,21 @@
            aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames());


            CityAqi cityAqi = new CityAqi();
            cityAqi.setCityCode(cityCode);
            cityAqi.setTime(dataTime);
            cityAqi.setValue(JSONObject.toJSONString(aqi));
            cityAqiMapper.insert(cityAqi);
            cityAqiList.add(cityAqi);
            //存入redis
            redisTemplate.opsForHash().put(RedisConstants.CITY_AQI, cityCode.toString(), aqi);
        }
        cityAqiMapper.insertCityAqi(cityAqiList);
    }

    @Override
    public List<CityAqi> getCityAqi() {
        String time = DateUtils.getDateStringOfHour(-1, DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
        QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("time", time);
        return cityAqiMapper.selectList(queryWrapper);
    }
}