~chenjialiang/moral.git

			@@ -9,18 +9,23 @@
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.moral.api.service.CityConfigService;
			import com.moral.constant.Constants;
			import com.moral.constant.RedisConstants;
			import com.moral.util.AQIUtils;
			import com.moral.util.AmendUtils;
			import com.moral.util.ComprehensiveIndexUtils;
			import com.moral.util.DateUtils;

			import org.springframework.beans.factory.annotation.Autowired;

			import org.springframework.data.redis.core.RedisTemplate;
			import org.springframework.stereotype.Service;
			import org.springframework.util.ObjectUtils;
			import org.springframework.web.client.RestTemplate;

			import java.util.Date;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;

			/**
			* <p>
			@@ -42,6 +47,12 @@
			@Autowired
			private RestTemplate restTemplate;

			@Autowired
			private RedisTemplate redisTemplate;

			@Autowired


			@Override
			public void insertCityAqi() {
			//获取城市配置
			@@ -50,7 +61,7 @@
			List<CityConfig> list = cityConfigService.list(wrapper);
			Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
			for (CityConfig cityConfig : list) {
			String cityCode = cityConfig.getCityCode();
			Integer cityCode = cityConfig.getCityCode();
			Map<String, Object> data;
			try {
			//从第三方接口获取数据
			@@ -70,39 +81,47 @@
			aqi.put("so2", aqi.remove("so2C"));
			aqi.put("no2", aqi.remove("no2C"));
			aqi.put("co", aqi.remove("coC"));
			aqi.put("o3", aqi.remove("o3c"));
			aqi.put("o3", aqi.remove("o3C"));
			aqi.put("aqi", aqi.remove("value"));

			//o3滑动值计算
			//获取一天内每个小时o3数据
			QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
			queryWrapper.select("time", "value").eq("city_code", cityCode);
			List<Map<String, Object>> cityAqis = cityAqiMapper.selectMaps(queryWrapper);
			List<Map<String, Object>> o3_8H = AmendUtils.getO3_8H(cityAqis);
			if (!ObjectUtils.isEmpty(o3_8H)) {
			for (Map<String, Object> o3Map : o3_8H) {
			String hourTime = o3Map.get("time").toString();
			if (DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN).equals(hourTime)) {
			o3Map.get("o3");
			aqi.put("o3_8h", o3Map.get("o3"));
			break;
			}
			}
			}

			//综合指数计算
			Map<String, Object> temp = new HashMap<>(aqi);
			temp.put("o3", temp.get("o3_8h"));
			Double compositeIndex = ComprehensiveIndexUtils.dailyData(temp);
			aqi.put("compositeIndex", compositeIndex);


			//首要污染物计算
			Map<String, Object> pollutant = AQIUtils.cityAqiPollutant(aqi);
			if (!ObjectUtils.isEmpty(pollutant)) {
			aqi.putAll(pollutant);
			}


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

			@Override
			public void insertCityAqiDaily() {
			String format = DateUtils.yyyy_MM_dd_EN;
			Date now = new Date();
			//开始时间，昨日
			Date start = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), format);
			//结束时间，今日
			Date end = DateUtils.dataToTimeStampTime(now, format);
			//获取所有城市aqi小时数据
			QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
			wrapper.select("city_code", "value")
			.ge("time", DateUtils.dateToDateString(start))
			.lt("time", DateUtils.dateToDateString(end));
			List<Map<String, Object>> dailyData = cityAqiMapper.selectMaps(wrapper);

			if (dailyData.size() == 0) {
			return;
			}
			//按city_code分组
			Map<String, List<Map<String, Object>>> data = dailyData.parallelStream().collect(Collectors.groupingBy(o -> (String) o.get("city_code")));
			data.forEach((cityCode, value) -> {

			});

			}
			}