贡献率数据格式修改

jinpengyong

2022-01-05 85dba01ea5021d83487c3ed2d60706f516a0774b

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

@@ -3,11 +3,11 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.CityAqi;
import com.moral.api.entity.CityConfig;
import com.moral.api.entity.CityConfigAqi;
import com.moral.api.mapper.CityAqiMapper;
import com.moral.api.service.CityAqiService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.CityConfigService;
import com.moral.api.service.CityConfigAqiService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.pojo.AQI;
@@ -45,7 +45,7 @@
    private CityAqiMapper cityAqiMapper;

    @Autowired
    private CityConfigService cityConfigService;
    private CityConfigAqiService cityConfigAqiService;

    @Autowired
    private RestTemplate restTemplate;
@@ -61,21 +61,22 @@
        //存入数据库是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);
        }

        //获取城市配置
        QueryWrapper<CityConfig> wrapper = new QueryWrapper<>();
        QueryWrapper<CityConfigAqi> wrapper = new QueryWrapper<>();
        wrapper.select("city_code", "city_id").eq("is_delete", Constants.NOT_DELETE);
        List<CityConfig> list = cityConfigService.list(wrapper);
        List<CityConfigAqi> list = cityConfigAqiService.list(wrapper);

        for (CityConfig cityConfig : list) {
            Integer cityCode = cityConfig.getCityCode();
        CityAqi cityAqi = new CityAqi();
        for (CityConfigAqi cityConfigAqi : list) {
            Integer cityCode = cityConfigAqi.getCityCode();
            Map<String, Object> data;
            try {
                //从第三方接口获取数据
                data = restTemplate.getForObject("http://sapi.7drlb.com/api/mj?cityID={1}&apiKey=aqi", Map.class, cityConfig.getCityId());
                data = restTemplate.getForObject("http://sapi.7drlb.com/api/mj?cityID={1}&apiKey=aqi", Map.class, cityConfigAqi.getCityId());
            } catch (Exception e) {
                continue;
            }
@@ -112,7 +113,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,7 +143,6 @@
            aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames());


            CityAqi cityAqi = new CityAqi();
            cityAqi.setCityCode(cityCode);
            cityAqi.setTime(dataTime);
            cityAqi.setValue(JSONObject.toJSONString(aqi));
@@ -151,4 +151,12 @@
            redisTemplate.opsForHash().put(RedisConstants.CITY_AQI, cityCode.toString(), aqi);
        }
    }

    @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);
    }
}