From f3452e172e49eb8b588bec6c81a7e08b458fc4bd Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Fri, 22 Apr 2022 09:44:36 +0800 Subject: [PATCH] 企业整顿清单 --- screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 107 ++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 81 insertions(+), 26 deletions(-) diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java index be072d3..7d589da 100644 --- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java +++ b/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; @@ -19,15 +19,22 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; 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; import java.util.Map; import java.util.OptionalDouble; +import java.util.stream.Collectors; import java.util.stream.DoubleStream; /** @@ -45,7 +52,7 @@ private CityAqiMapper cityAqiMapper; @Autowired - private CityConfigService cityConfigService; + private CityConfigAqiService cityConfigAqiService; @Autowired private RestTemplate restTemplate; @@ -53,27 +60,62 @@ @Autowired private RedisTemplate redisTemplate; + //������aqi������������������������������������������������������������CityID��������������������������������� @Override public void insertCityAqi() { + //pubtime=08���������������07-08������������������������������������������������07��� Date now = new Date(); Date time = DateUtils.dataToTimeStampTime(now, DateUtils.yyyy_MM_dd_HH_EN); - + //������������������time������������������ + Date dataTime = DateUtils.addHours(time, -1); Date start = null; - if (DateUtils.getHour(time) == 0 || DateUtils.getHour(time) >= 8) { - start = DateUtils.addHours(time, -7); + 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(); + //������������������������������������������������ + Map<Integer, List<Map<String, Object>>> cityData = null; + if (start != null) { + QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>(); + List<Integer> cityCodes = list.stream().map(CityConfigAqi::getCityCode) + .collect(Collectors.toList()); + + queryWrapper.select("city_code", "time", "value") + .ge("time", start) + .in("city_code", cityCodes); + List<Map<String, Object>> selectMaps = cityAqiMapper.selectMaps(queryWrapper); + + //���city_code������ + cityData = selectMaps.stream() + .collect(Collectors.groupingBy(o -> Integer.parseInt(o.get("city_code").toString()))); + } + + + List<CityAqi> cityAqiList = new ArrayList<>(); + + + String url = "http://aliv13.data.moji.com/whapi/json/alicityweather/aqi"; + String appcode = "31b6ea8f804a4472be3b633cfee44849"; + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.add("Authorization", "APPCODE " + appcode); + //������������ + LinkedMultiValueMap<String, Object> requestParams = new LinkedMultiValueMap<>(); + + for (CityConfigAqi cityConfigAqi : list) { + CityAqi cityAqi = new CityAqi(); + 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()); + requestParams.set("cityId", cityConfigAqi.getCityId()); + HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(requestParams, httpHeaders); + ResponseEntity<String> response = restTemplate.postForEntity(url, httpEntity, String.class); + data = JSONObject.parseObject(response.getBody(), Map.class); } catch (Exception e) { continue; } @@ -83,8 +125,14 @@ Map<String, Object> map = (Map<String, Object>) data.get("data"); Map<String, Object> aqi = (Map<String, Object>) map.get("aqi"); - aqi.put("PM2_5", aqi.remove("pm25C")); aqi.remove("pm25"); + aqi.remove("pm10"); + aqi.remove("so2"); + aqi.remove("no2"); + aqi.remove("co"); + aqi.remove("o3"); + + aqi.put("PM2_5", aqi.remove("pm25C")); aqi.put("PM10", aqi.remove("pm10C")); aqi.put("SO2", aqi.remove("so2C")); aqi.put("NO2", aqi.remove("no2C")); @@ -93,18 +141,18 @@ aqi.put("AQI", aqi.remove("value")); //o3��������������� - if (start != null) { - QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>(); - queryWrapper.select("time", "value") - .eq("city_code", cityCode) - .ge("time", DateUtils.dateToDateString(start)); - List<Map<String, Object>> cityAqis = cityAqiMapper.selectMaps(queryWrapper); + if (cityData != null) { + List<Map<String, Object>> cityAqis = cityData.get(cityCode); + if (cityAqis == null) { + cityAqis = new ArrayList<>(); + } + Map<String, Object> params = new HashMap<>(); - params.put("time", DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_S_EN)); + params.put("time", DateUtils.dateToDateString(dataTime, DateUtils.yyyy_MM_dd_HH_mm_ss_S_EN)); 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); @@ -131,17 +179,24 @@ sixParamMap.put(Constants.SENSOR_CODE_CO, aqi.get("CO")); sixParamMap.put(Constants.SENSOR_CODE_O3, aqi.get("O3")); AQI aqiAndPollutant = AQIUtils.hourlyAQI(sixParamMap); - if (!ObjectUtils.isEmpty(aqiAndPollutant.getPrimaryPollutantNames())) { - aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames()); - } + aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames()); - CityAqi cityAqi = new CityAqi(); + cityAqi.setCityCode(cityCode); - cityAqi.setTime(time); + 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); } } -- Gitblit v1.8.0