From fc8fe626f222e024c1c4b45759ef0102174e5b9c Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 12 Apr 2023 09:11:58 +0800 Subject: [PATCH] 添加风场历史小时数据显示 --- screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 1087 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 746 insertions(+), 341 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java index 536f9f5..68f32c2 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java @@ -3,22 +3,20 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.moral.api.entity.CityAqi; -import com.moral.api.entity.CityAqiDaily; -import com.moral.api.entity.CityAqiMonthly; -import com.moral.api.entity.CityAqiYearly; -import com.moral.api.entity.Forecast; -import com.moral.api.entity.Organization; -import com.moral.api.entity.SysArea; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.moral.api.config.properties.SpecialCitiesProperties; +import com.moral.api.entity.*; import com.moral.api.mapper.CityAqiMapper; +import com.moral.api.mapper.DeviceMapper; import com.moral.api.mapper.ForecastMapper; -import com.moral.api.service.CityAqiDailyService; -import com.moral.api.service.CityAqiMonthlyService; -import com.moral.api.service.CityAqiService; +import com.moral.api.mapper.SysAreaMapper; +import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel; +import com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent; +import com.moral.api.pojo.form.aqi.AirQualityComparisonForm; +import com.moral.api.pojo.vo.cityAQI.AirQualityComparisonVO; +import com.moral.api.pojo.vo.cityAQI.CityAreaRangeVO; +import com.moral.api.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.moral.api.service.CityAqiYearlyService; -import com.moral.api.service.OrganizationService; -import com.moral.api.service.SysAreaService; import com.moral.constant.Constants; import com.moral.constant.RedisConstants; import com.moral.pojo.AQI; @@ -34,7 +32,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; -import java.text.DecimalFormat; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; import java.util.stream.DoubleStream; @@ -60,9 +59,6 @@ private RedisTemplate redisTemplate; @Autowired - private OrganizationService organizationService; - - @Autowired private SysAreaService sysAreaService; @Autowired @@ -73,6 +69,27 @@ @Autowired private CityAqiYearlyService cityAqiYearlyService; + + @Autowired + private SpecialCitiesProperties specialCitiesProperties; + + @Autowired + private CityWeatherService cityWeatherService; + + @Autowired + private OrganizationService organizationService; + + @Autowired + private DeviceMapper deviceMapper; + + @Autowired + private HistoryHourlyService historyHourlyService; + + @Autowired + SpecialCitiesProperties citiesProperties; + + @Autowired + private SysAreaMapper sysAreaMapper; @Override public List<Map<String, Object>> measuredCompareForecastOfO3(Map<String, Object> params) { @@ -146,7 +163,7 @@ value = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.CITY_AQI, String.valueOf(regionCode)); if (value == null) value = queryCityAqiByRegionCodeFromDB(regionCode); - }else{ + } else { return null; } } @@ -167,7 +184,7 @@ lastDataWrapper.orderByDesc("time"); lastDataWrapper.last(true, "limit 1"); CityAqi cityAqi = cityAqiMapper.selectOne(lastDataWrapper); - if(cityAqi==null) + if (cityAqi == null) return null; //���������24������������������ Date endDate = cityAqi.getTime(); @@ -260,39 +277,46 @@ Integer curCityCode = Integer.parseInt(s.substring(0, 4) + "00"); QueryWrapper<SysArea> areaWrapper = new QueryWrapper<>(); - if ("province".equals(cityType)) { - //��������������������� - areaWrapper.select("area_code").eq("parent_code", curProvinceCode); + + List<SysArea> sysAreas; + if ("28".equals(cityType)) { + //������2+26������ + sysAreas = specialCitiesProperties.getTwentyEightCities(); } else { - //������������������������ - areaWrapper.select("area_code").eq("parent_code", curCityCode); + if ("province".equals(cityType)) { + //��������������������� + areaWrapper.select("area_code", "area_name").eq("parent_code", curProvinceCode); + } else { + //������������������������ + areaWrapper.select("area_code", "area_name").eq("parent_code", curCityCode); + } + sysAreas = sysAreaService.list(areaWrapper); } - List<Object> regionCodes = sysAreaService.listObjs(areaWrapper); switch (type) { case "today": - result = accumulatedTodayRank(regionCodes); + result = accumulatedTodayRank(sysAreas); break; case "hour": time = new StringBuilder(time).replace(10, 11, " ").toString() + ":00:00"; - result = hourRank(regionCodes, time); + result = hourRank(sysAreas, time); break; case "day": time = time + " 00:00:00"; - result = dayRank(regionCodes, time); + result = dayRank(sysAreas, time); break; case "month": time = time + "-01 00:00:00"; - result = monthRank(regionCodes, time); + result = monthRank(sysAreas, time); break; case "year": time = time + "-01-01 00:00:00"; - result = yearRank(regionCodes, time); + result = yearRank(sysAreas, time); break; case "custom": start = start + " 00:00:00"; end = end + " :00:00"; - result = customRank(regionCodes, start, end); + result = customRank(sysAreas, start, end); break; default: break; @@ -301,10 +325,14 @@ } /** - * @param regionCodes ��������������������������������������� + * @param sysAreas ������������������������ * @return ��������������������������� */ - private List<Map<String, Object>> accumulatedTodayRank(List<Object> regionCodes) { + private List<Map<String, Object>> accumulatedTodayRank(List<SysArea> sysAreas) { + List<Integer> regionCodes = sysAreas.stream() + .map(SysArea::getAreaCode) + .collect(Collectors.toList()); + List<Map<String, Object>> result = new ArrayList<>(); List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2", "CO", "O3"); Date now = new Date(); @@ -315,7 +343,7 @@ .in("city_code", regionCodes); List<Map<String, Object>> cumulativeData = cityAqiMapper.selectMaps(wrapper); //���city_code������ - Map<String, List<Map<String, Object>>> data = cumulativeData.parallelStream().collect(Collectors.groupingBy(o -> o.get("city_code").toString())); + Map<Integer, List<Map<String, Object>>> data = cumulativeData.parallelStream().collect(Collectors.groupingBy(o -> Integer.parseInt(o.get("city_code").toString()))); data.forEach((cityCode, value) -> { List<Double> doubles = new ArrayList<>(); for (Map<String, Object> objectMap : value) { @@ -377,22 +405,27 @@ dataMap.put("compositeIndex", compositeIndex); //��������� - QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>(); - queryWrapper.select("area_name").eq("area_code", cityCode); - String areaName = sysAreaService.getOne(queryWrapper).getAreaName(); - dataMap.put("cityName", areaName); - + for (SysArea sysArea : sysAreas) { + if (cityCode.equals(sysArea.getAreaCode())) { + dataMap.put("cityName", sysArea.getAreaName()); + break; + } + } result.add(dataMap); }); return result; } /** - * @param regionCodes ��������������������������������� - * @param time ��������������������������� 2021-11-04 13:00:00 + * @param sysAreas ������������������������ + * @param time ��������������������������� 2021-11-04 13:00:00 * @return ��������������������� */ - private List<Map<String, Object>> hourRank(List<Object> regionCodes, String time) { + private List<Map<String, Object>> hourRank(List<SysArea> sysAreas, String time) { + List<Integer> regionCodes = sysAreas.stream() + .map(SysArea::getAreaCode) + .collect(Collectors.toList()); + List<Map<String, Object>> result = new ArrayList<>(); QueryWrapper<CityAqi> wrapper = new QueryWrapper<>(); wrapper.select("value") @@ -415,285 +448,116 @@ } /** - * @param regionCodes ��������������������������������� - * @param time ��������������������������� 2021-11-04 00:00:00 + * @param sysAreas ������������������������ + * @param time ��������������������������� 2021-11-04 00:00:00 * @return ������������������ */ - private List<Map<String, Object>> dayRank(List<Object> regionCodes, String time) { + private List<Map<String, Object>> dayRank(List<SysArea> sysAreas, String time) { + List<Integer> regionCodes = sysAreas.stream() + .map(SysArea::getAreaCode) + .collect(Collectors.toList()); + List<Map<String, Object>> result = new ArrayList<>(); QueryWrapper<CityAqiDaily> wrapper = new QueryWrapper<>(); wrapper.select("city_code", "value") .eq("time", time) .in("city_code", regionCodes); - 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"); + List<CityAqiDaily> dayData = cityAqiDailyService.list(wrapper); + for (CityAqiDaily cityAqiDaily : dayData) { + Map<String, Object> resultMap = JSONObject.parseObject(cityAqiDaily.getValue(), Map.class); + resultMap.put("O3_8H", resultMap.remove("O3")); + List<String> primaryPollutantNames = (List<String>) resultMap.get("primaryPollutant"); String primaryPollutant = ""; if (!ObjectUtils.isEmpty(primaryPollutantNames)) { primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(",")); } - value.put("primaryPollutant", primaryPollutant); + resultMap.put("primaryPollutant", primaryPollutant); + + //��������� - QueryWrapper<SysArea> queryWrapper = new QueryWrapper<>(); - queryWrapper.select("area_name") - .eq("area_code", dayDatum.get("city_code")); - String areaName = sysAreaService.getOne(queryWrapper).getAreaName(); - value.put("cityName", areaName); - result.add(value); + for (SysArea sysArea : sysAreas) { + if (cityAqiDaily.getCityCode().equals(sysArea.getAreaCode())) { + resultMap.put("cityName", sysArea.getAreaName()); + break; + } + } + result.add(resultMap); } return result; } /** - * @param regionCodes ��������������������������������� - * @param time ��������������������������� 2021-11-01 00:00:00 ������1��� + * @param sysAreas ������������������������ + * @param time ��������������������������� 2021-11-01 00:00:00 * @return ������������������ */ - private List<Map<String, Object>> monthRank(List<Object> regionCodes, String time) { - //��������������������������� - List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2"); + private List<Map<String, Object>> monthRank(List<SysArea> sysAreas, String time) { + List<Integer> regionCodes = sysAreas.stream() + .map(SysArea::getAreaCode) + .collect(Collectors.toList()); + List<Map<String, Object>> result = new ArrayList<>(); - //���������������,������������������������������city_aqi_monthly������ - if (!time.substring(0, 7).equals(DateUtils.dateToDateString(new Date(), DateUtils.yyyy_MM_EN))) { - QueryWrapper<CityAqiMonthly> cityAqiMonthlyQueryWrapper = new QueryWrapper<>(); - for (Object regionCode : regionCodes) { - cityAqiMonthlyQueryWrapper.clear(); - cityAqiMonthlyQueryWrapper.select("value") - .eq("city_code", regionCode) - .eq("time", time); - CityAqiMonthly cityAqiMonthly = cityAqiMonthlyService.getOne(cityAqiMonthlyQueryWrapper); - if (cityAqiMonthly == null) { - continue; - } - String value = cityAqiMonthly.getValue(); - Map<String, Object> resultMap = JSONObject.parseObject(value, Map.class); - //��������� - QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>(); - sysAreaQueryWrapper.select("area_name") - .eq("area_code", regionCode); - String areaName = sysAreaService.getOne(sysAreaQueryWrapper).getAreaName(); - resultMap.put("cityName", areaName); - result.add(resultMap); - } - return result; - } - - QueryWrapper<CityAqiDaily> cityAqiDailyQueryWrapper = new QueryWrapper<>(); - cityAqiDailyQueryWrapper.select("city_code", "value") - .ge("time", time) + QueryWrapper<CityAqiMonthly> cityAqiMonthlyQueryWrapper = new QueryWrapper<>(); + cityAqiMonthlyQueryWrapper.select("city_code", "value") + .eq("time", time) .in("city_code", regionCodes); - List<Map<String, Object>> thisMonthData = cityAqiDailyService.listMaps(cityAqiDailyQueryWrapper); - //���city_code������ - Map<String, List<Map<String, Object>>> thisMonthMap = thisMonthData.parallelStream().collect(Collectors.groupingBy(o -> o.get("city_code").toString())); - thisMonthMap.forEach((cityCode, value) -> { - Map<String, Object> resultMap = new HashMap<>(); - - Map<String, Object> params = new HashMap<>(); - List<Map<String, Object>> temp = new ArrayList<>(); - for (Map<String, Object> map : value) { - Map<String, Object> sensorsValue = JSONObject.parseObject(map.get("value").toString(), Map.class); - Map<String, Object> tempMap = new HashMap<>(); - tempMap.put(Constants.SENSOR_CODE_CO, sensorsValue.get("CO")); - tempMap.put(Constants.SENSOR_CODE_O3, sensorsValue.get("O3")); - Map<String, Object> hashMap = new HashMap<>(); - hashMap.put("value", JSONObject.toJSONString(tempMap)); - temp.add(hashMap); - } - params.put("data", temp); - //1. CO 95������������������������ - Map<String, Object> coAvgOfWeekOrMonth = AmendUtils.getCOAvgOfWeekOrMonth(params); - if (!ObjectUtils.isEmpty(coAvgOfWeekOrMonth)) { - resultMap.put("CO", coAvgOfWeekOrMonth.get(Constants.SENSOR_CODE_CO)); - } - - //2. O3 90������������������������ - Map<String, Object> o3AvgOfWeekOrMonth = AmendUtils.getO3AvgOfWeekOrMonth(params); - if (!ObjectUtils.isEmpty(o3AvgOfWeekOrMonth)) { - resultMap.put("O3", o3AvgOfWeekOrMonth.get(Constants.SENSOR_CODE_O3)); - } - - sensors.forEach(sensor -> { - OptionalDouble optionalDouble = value.parallelStream().flatMapToDouble(v -> { - Map<String, Object> sensorValue = JSONObject.parseObject((String) v.get("value"), Map.class); - Object o = sensorValue.get(sensor); - if (ObjectUtils.isEmpty(o)) { - return null; - } - double aDouble = Double.parseDouble(o.toString()); - return DoubleStream.of(aDouble); - }).average(); - - if (optionalDouble.isPresent()) { - //��������������������� - double sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 0); - resultMap.put(sensor, sciCal); - } - }); - - //������������������ - Double compositeIndex = ComprehensiveIndexUtils.dailyData(resultMap); - resultMap.put("compositeIndex", compositeIndex); - - //������O3���O3_8H������ + List<CityAqiMonthly> list = cityAqiMonthlyService.list(cityAqiMonthlyQueryWrapper); + for (CityAqiMonthly cityAqiMonthly : list) { + Map<String, Object> resultMap = JSONObject.parseObject(cityAqiMonthly.getValue(), Map.class); resultMap.put("O3_8H", resultMap.remove("O3")); - - //��������������������������� - Date lastMonth = DateUtils.addMonths(DateUtils.getDate(time), -1); - QueryWrapper<CityAqiMonthly> queryWrapper = new QueryWrapper<>(); - queryWrapper.select("value") - .eq("city_code", cityCode) - .eq("time", DateUtils.dateToDateString(lastMonth)); - //������������������ - CityAqiMonthly lastCityAqiMonthly = cityAqiMonthlyService.getOne(queryWrapper); - String monthContrast = ""; - if (lastCityAqiMonthly != null) { - Map<String, Object> map = JSONObject.parseObject(lastCityAqiMonthly.getValue(), Map.class); - double lastCompositeIndex = Double.parseDouble(map.get("compositeIndex").toString()); - DecimalFormat decimalFormat = new DecimalFormat("0.00%"); - monthContrast = decimalFormat.format((compositeIndex - lastCompositeIndex) / lastCompositeIndex); - } - resultMap.put("monthContrast", monthContrast); - //��������� - QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>(); - sysAreaQueryWrapper.select("area_name") - .eq("area_code", cityCode); - String areaName = sysAreaService.getOne(sysAreaQueryWrapper).getAreaName(); - resultMap.put("cityName", areaName); - + for (SysArea sysArea : sysAreas) { + if (cityAqiMonthly.getCityCode().equals(sysArea.getAreaCode())) { + resultMap.put("cityName", sysArea.getAreaName()); + break; + } + } result.add(resultMap); - }); + } return result; } /** - * @param regionCodes ��������������������������������� - * @param time ��������������������������� 2021-11-01 00:00:00 ������1���1��� + * @param sysAreas ������������������������ + * @param time ��������������������������� 2021-11-01 00:00:00 ������1���1��� * @return ������������������ */ - private List<Map<String, Object>> yearRank(List<Object> regionCodes, String time) { - //��������������������������� - List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2"); + private List<Map<String, Object>> yearRank(List<SysArea> sysAreas, String time) { + List<Integer> regionCodes = sysAreas.stream() + .map(SysArea::getAreaCode) + .collect(Collectors.toList()); + List<Map<String, Object>> result = new ArrayList<>(); - //���������������,������������������������������city_aqi_monthly������ - if (!time.substring(0, 4).equals(DateUtils.dateToDateString(new Date(), DateUtils.yyyy))) { - QueryWrapper<CityAqiYearly> cityAqiYearlyQueryWrapper = new QueryWrapper<>(); - for (Object regionCode : regionCodes) { - cityAqiYearlyQueryWrapper.clear(); - cityAqiYearlyQueryWrapper.select("value") - .eq("city_code", regionCode) - .eq("time", time); - CityAqiYearly cityAqiYearly = cityAqiYearlyService.getOne(cityAqiYearlyQueryWrapper); - if (cityAqiYearly == null) { - continue; - } - String value = cityAqiYearly.getValue(); - Map<String, Object> resultMap = JSONObject.parseObject(value, Map.class); - //��������� - QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>(); - sysAreaQueryWrapper.select("area_name") - .eq("area_code", regionCode); - String areaName = sysAreaService.getOne(sysAreaQueryWrapper).getAreaName(); - resultMap.put("cityName", areaName); - result.add(resultMap); - } - return result; - } - - QueryWrapper<CityAqiDaily> cityAqiDailyQueryWrapper = new QueryWrapper<>(); - cityAqiDailyQueryWrapper.select("city_code", "value") - .ge("time", time) - .in("city_code", regionCodes); - List<Map<String, Object>> thisMonthData = cityAqiDailyService.listMaps(cityAqiDailyQueryWrapper); - //���city_code������ - Map<String, List<Map<String, Object>>> thisYearMap = thisMonthData.parallelStream().collect(Collectors.groupingBy(o -> o.get("city_code").toString())); - thisYearMap.forEach((cityCode, value) -> { - Map<String, Object> resultMap = new HashMap<>(); - - Map<String, Object> params = new HashMap<>(); - List<Map<String, Object>> temp = new ArrayList<>(); - for (Map<String, Object> map : value) { - Map<String, Object> sensorsValue = JSONObject.parseObject(map.get("value").toString(), Map.class); - Map<String, Object> tempMap = new HashMap<>(); - tempMap.put(Constants.SENSOR_CODE_CO, sensorsValue.get("CO")); - tempMap.put(Constants.SENSOR_CODE_O3, sensorsValue.get("O3")); - Map<String, Object> hashMap = new HashMap<>(); - hashMap.put("value", JSONObject.toJSONString(tempMap)); - temp.add(hashMap); - } - params.put("data", temp); - //1. CO 95������������������������ - Map<String, Object> coAvgOfWeekOrMonth = AmendUtils.getCOAvgOfWeekOrMonth(params); - if (!ObjectUtils.isEmpty(coAvgOfWeekOrMonth)) { - resultMap.put("CO", coAvgOfWeekOrMonth.get(Constants.SENSOR_CODE_CO)); - } - - //2. O3 90������������������������ - Map<String, Object> o3AvgOfWeekOrMonth = AmendUtils.getO3AvgOfWeekOrMonth(params); - if (!ObjectUtils.isEmpty(o3AvgOfWeekOrMonth)) { - resultMap.put("O3", o3AvgOfWeekOrMonth.get(Constants.SENSOR_CODE_O3)); - } - - sensors.forEach(sensor -> { - OptionalDouble optionalDouble = value.parallelStream().flatMapToDouble(v -> { - Map<String, Object> sensorValue = JSONObject.parseObject((String) v.get("value"), Map.class); - Object o = sensorValue.get(sensor); - if (ObjectUtils.isEmpty(o)) { - return null; - } - double aDouble = Double.parseDouble(o.toString()); - return DoubleStream.of(aDouble); - }).average(); - - if (optionalDouble.isPresent()) { - //��������������������� - double sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 0); - resultMap.put(sensor, sciCal); - } - }); - - //������������������ - Double compositeIndex = ComprehensiveIndexUtils.dailyData(resultMap); - resultMap.put("compositeIndex", compositeIndex); - - //������O3���O3_8H������ + QueryWrapper<CityAqiYearly> cityAqiYearlyQueryWrapper = new QueryWrapper<>(); + cityAqiYearlyQueryWrapper.select("city_code", "value") + .in("city_code", regionCodes) + .eq("time", time); + List<CityAqiYearly> list = cityAqiYearlyService.list(cityAqiYearlyQueryWrapper); + for (CityAqiYearly cityAqiYearly : list) { + Map<String, Object> resultMap = JSONObject.parseObject(cityAqiYearly.getValue(), Map.class); resultMap.put("O3_8H", resultMap.remove("O3")); - - //��������������������������� - String lastYear = DateUtils.getDateAddYear(time.substring(0, 4), -1); - QueryWrapper<CityAqiYearly> queryWrapper = new QueryWrapper<>(); - queryWrapper.select("value") - .eq("city_code", cityCode) - .eq("time", lastYear); - //������������������ - CityAqiYearly lastCityAqiYearly = cityAqiYearlyService.getOne(queryWrapper); - String yearContrast = ""; - if (lastCityAqiYearly != null) { - Map<String, Object> map = JSONObject.parseObject(lastCityAqiYearly.getValue(), Map.class); - double lastCompositeIndex = Double.parseDouble(map.get("compositeIndex").toString()); - DecimalFormat decimalFormat = new DecimalFormat("0.00%"); - yearContrast = decimalFormat.format((compositeIndex - lastCompositeIndex) / lastCompositeIndex); + for (SysArea sysArea : sysAreas) { + if (cityAqiYearly.getCityCode().equals(sysArea.getAreaCode())) { + resultMap.put("cityName", sysArea.getAreaName()); + break; + } } - resultMap.put("yearContrast", yearContrast); - //��������� - QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>(); - sysAreaQueryWrapper.select("area_name").eq("area_code", cityCode); - String areaName = sysAreaService.getOne(sysAreaQueryWrapper).getAreaName(); - resultMap.put("cityName", areaName); - result.add(resultMap); - }); + } return result; } /** - * @param regionCodes ��������������������������������� - * @param start ���������������������������������,���������������2021-11-03 00:00:00 - * @param end ���������������������������������,���������������2021-11-25 00:00:00 + * @param sysAreas ������������������������ + * @param start ���������������������������������,���������������2021-11-03 00:00:00 + * @param end ���������������������������������,���������������2021-11-25 00:00:00 * @return ������������������������ */ - private List<Map<String, Object>> customRank(List<Object> regionCodes, String start, String end) { + private List<Map<String, Object>> customRank(List<SysArea> sysAreas, String start, String end) { + List<Integer> regionCodes = sysAreas.stream() + .map(SysArea::getAreaCode) + .collect(Collectors.toList()); + //��������������������������� List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2"); List<Map<String, Object>> result = new ArrayList<>(); @@ -704,7 +568,8 @@ .in("city_code", regionCodes); List<Map<String, Object>> thisMonthData = cityAqiDailyService.listMaps(cityAqiDailyQueryWrapper); //���city_code������ - Map<String, List<Map<String, Object>>> customMap = thisMonthData.parallelStream().collect(Collectors.groupingBy(o -> o.get("city_code").toString())); + Map<Integer, List<Map<String, Object>>> customMap = thisMonthData.parallelStream() + .collect(Collectors.groupingBy(o -> Integer.parseInt(o.get("city_code").toString()))); customMap.forEach((cityCode, value) -> { Map<String, Object> resultMap = new HashMap<>(); @@ -758,74 +623,22 @@ resultMap.put("O3_8H", resultMap.remove("O3")); //��������� - QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>(); - sysAreaQueryWrapper.select("area_name").eq("area_code", cityCode); - String areaName = sysAreaService.getOne(sysAreaQueryWrapper).getAreaName(); - resultMap.put("cityName", areaName); - + for (SysArea sysArea : sysAreas) { + if (cityCode.equals(sysArea.getAreaCode())) { + resultMap.put("cityName", sysArea.getAreaName()); + break; + } + } result.add(resultMap); }); return result; } - /** - * @Description: ������6������������ - * @Param: [cityAqiList] - * @return: java.util.Map<java.lang.String , java.lang.Double> - * ���������key���sensorCode,value������ - * @Author: ��������� - * @Date: 2021/11/2 - */ - private Map<String, Object> calculate6ParamAvg(List<CityAqi> cityAqiList) { - Double co = calculateSensorAvg(cityAqiList, "CO"); - Double pm2_5 = calculateSensorAvg(cityAqiList, "PM2_5"); - Double pm10 = calculateSensorAvg(cityAqiList, "PM10"); - Double so2 = calculateSensorAvg(cityAqiList, "SO2"); - Double no2 = calculateSensorAvg(cityAqiList, "NO2"); - Double o3 = calculateSensorAvg(cityAqiList, "O3"); - Map<String, Object> result = new HashMap<>(); - result.put(Constants.SENSOR_CODE_CO, co); - result.put(Constants.SENSOR_CODE_NO2, no2); - result.put(Constants.SENSOR_CODE_SO2, so2); - result.put(Constants.SENSOR_CODE_O3, o3); - result.put(Constants.SENSOR_CODE_PM25, pm2_5); - result.put(Constants.SENSOR_CODE_PM10, pm10); - return result; - } - - /** - * @Description: ������������������������ - * @Param: [cityAqiList, sensor] - * ���sensor��������������������������� - * @return: java.lang.Double - * @Author: ��������� - * @Date: 2021/11/2 - */ - private Double calculateSensorAvg(List<CityAqi> cityAqiList, String sensor) { - Double sum = 0d; - int num = 0; - for (CityAqi cityAqi : cityAqiList) { - String value = cityAqi.getValue(); - if (value == null) - continue; - Map<String, Object> valueMap = JSON.parseObject(value, Map.class); - Object sensorValueObject = valueMap.get(sensor); - if (sensorValueObject == null) - continue; - Double sensorValue = Double.valueOf(sensorValueObject.toString()); - sum = MathUtils.add(sum, sensorValue); - num++; - } - if (num == 0) - return null; - Double avg = MathUtils.division(sum, num, 2); - return avg; - } /** * @Description: ������������������������ * @Param: [regionCode] - * @return: java.util.Map<java.lang.String , java.lang.Object> + * @return: java.util.Map<java.lang.String , java.lang.Object> * @Author: ��������� * @Date: 2021/10/28 */ @@ -951,6 +764,514 @@ return result; } + @Override + public List<AirQualityComparisonVO> queryAirQualityComparison(AirQualityComparisonForm form) { + //������ + Integer regionCode = form.getRegionCode(); + String regionType = form.getRegionType(); + Date startDate = form.getStartDate(); + Date endDate = form.getEndDate(); + Date comparisonStartDate = form.getComparisonStartDate(); + Date comparisonEndDate = form.getComparisonEndDate(); + String dateType = form.getDateType(); + //������������/������ + List<SysArea> areas = getSysAreasByRegionType(regionType, regionCode); + if (ObjectUtils.isEmpty(areas)) + return null; + List<AirQualityComparisonVO> vos = new ArrayList<>(); + for (SysArea area : areas) { + //������������������������������������6������������������ + Map<String, Object> data = getDataByTimeTypeAndRegionCode(dateType, startDate, endDate, area.getAreaCode()); + Map<String, Object> comparisonData = getDataByTimeTypeAndRegionCode(dateType, comparisonStartDate, comparisonEndDate, area.getAreaCode()); + if (ObjectUtils.isEmpty(data) || ObjectUtils.isEmpty(comparisonData)) + continue; + //��������������������������������������� + CityPollutionLevel days = cityAqiDailyService.calculateDaysByTimeAndSysArea(area, startDate, endDate); + CityPollutionLevel comparisonDays = cityAqiDailyService.calculateDaysByTimeAndSysArea(area, comparisonStartDate, comparisonEndDate); + int fineDays = days.getExcellentWeatherDays() + days.getGoodWeatherDays(); + int serverDays = days.getSeriousWeatherDays() + days.getServerWeatherDays(); + int comparisonFineDays = comparisonDays.getExcellentWeatherDays() + comparisonDays.getGoodWeatherDays(); + int comparisonServerDays = comparisonDays.getSeriousWeatherDays() + comparisonDays.getServerWeatherDays(); + //������6������������������ + Map<String, ConcentrationAndPercent> sixParamAndComIndexResult = contrastSixParamAndComIndex(data, comparisonData); + //������������������������������������������ + ConcentrationAndPercent fine = contrastDays(fineDays, comparisonFineDays); + ConcentrationAndPercent server = contrastDays(serverDays, comparisonServerDays); + //������������������ + AirQualityComparisonVO vo = new AirQualityComparisonVO(); + vo.setFineDays(fine); + vo.setServerDays(server); + vo.setCO(sixParamAndComIndexResult.get("CO")); + vo.setO3(sixParamAndComIndexResult.get("O3")); + vo.setPM25(sixParamAndComIndexResult.get("PM2_5")); + vo.setPM10(sixParamAndComIndexResult.get("PM10")); + vo.setSO2(sixParamAndComIndexResult.get("SO2")); + vo.setNO2(sixParamAndComIndexResult.get("NO2")); + vo.setCompositeIndex(sixParamAndComIndexResult.get("compositeIndex")); + vo.setCityName(area.getAreaName()); + vos.add(vo); + } + return vos; + } + + //������������ + @Override + public Map<String, Object> momData(Integer regionCode, Integer size, Integer current, Integer orgId) { + Map<String,Object> result = new HashMap<>(); + Page<CityAqi> page = new Page<>(current, size); + Page<CityAqi> pageNext = new Page<>(current+1, size); + QueryWrapper<CityAqi> cityAqiQueryWrapper = new QueryWrapper<>(); + cityAqiQueryWrapper.eq("city_code",regionCode); + Integer count = cityAqiMapper.selectCount(cityAqiQueryWrapper); + if (count==0){ + return result; + } + cityAqiQueryWrapper.orderByDesc("time"); + Page<CityAqi> resultPage = cityAqiMapper.selectPage(page, cityAqiQueryWrapper); + List<CityAqi> cityAqiList = resultPage.getRecords(); + Page<CityAqi> resultPageNext = cityAqiMapper.selectPage(pageNext, cityAqiQueryWrapper); + List<CityAqi> cityAqiListNext = resultPageNext.getRecords(); + List<Map<String,Object>> resultList = new ArrayList<>(); + if (cityAqiList.size()==0){ + return result; + } + for (int i=0; i<cityAqiList.size(); i++) { + Map<String,Object> resultMap = new HashMap<>(); + String hour = cityAqiList.get(i).getTime().toString().substring(11,13); + String previousHour = null; + Date previousTtime = null; + Double PM2_5 = null; + Double PM10 = null; + Double O3 = null; + Integer AQI = null; + String AQIIndex = null; + Double TVOC = null; + Double previousPM2_5 = null; + Double previousPM10 = null; + Double previousO3 = null; + String PM2_5_change = null; + String PM10_change = null; + String O3_change = null; + String value = cityAqiList.get(i).getValue(); + if (!ObjectUtils.isEmpty(value)){ + JSONObject jsonObject = JSONObject.parseObject(value); + if (!ObjectUtils.isEmpty(jsonObject.get("PM2_5"))){ + PM2_5 = Double.parseDouble(jsonObject.get("PM2_5").toString()); + } + if (!ObjectUtils.isEmpty(jsonObject.get("PM10"))){ + PM10 = Double.parseDouble(jsonObject.get("PM10").toString()); + } + if (!ObjectUtils.isEmpty(jsonObject.get("O3"))){ + O3 = Double.parseDouble(jsonObject.get("O3").toString()); + } + if (!ObjectUtils.isEmpty(jsonObject.get("AQI"))){ + AQI = Integer.parseInt(jsonObject.get("AQI").toString()); + AQIIndex = AQIUtils.classCodeOfPollutionByAqi(AQI); + } + } + if (i<cityAqiList.size()-1){ + previousHour = cityAqiList.get(i+1).getTime().toString().substring(11,13); + previousTtime = cityAqiList.get(i+1).getTime(); + String previousValue = cityAqiList.get(i+1).getValue(); + if (!ObjectUtils.isEmpty(previousValue)){ + JSONObject jsonObject = JSONObject.parseObject(previousValue); + if (!ObjectUtils.isEmpty(jsonObject.get("PM2_5"))){ + previousPM2_5 = Double.parseDouble(jsonObject.get("PM2_5").toString()); + } + if (!ObjectUtils.isEmpty(jsonObject.get("PM10"))){ + previousPM10 = Double.parseDouble(jsonObject.get("PM10").toString()); + } + if (!ObjectUtils.isEmpty(jsonObject.get("O3"))){ + previousO3 = Double.parseDouble(jsonObject.get("O3").toString()); + } + } + }else if (cityAqiListNext.size()>0){ + previousHour = cityAqiListNext.get(0).getTime().toString().substring(11,13); + previousTtime = cityAqiListNext.get(0).getTime(); + String previousValue = cityAqiListNext.get(0).getValue(); + if (!ObjectUtils.isEmpty(previousValue)){ + JSONObject jsonObject = JSONObject.parseObject(previousValue); + if (!ObjectUtils.isEmpty(jsonObject.get("PM2_5"))){ + previousPM2_5 = Double.parseDouble(jsonObject.get("PM2_5").toString()); + } + if (!ObjectUtils.isEmpty(jsonObject.get("PM10"))){ + previousPM10 = Double.parseDouble(jsonObject.get("PM10").toString()); + } + if (!ObjectUtils.isEmpty(jsonObject.get("O3"))){ + previousO3 = Double.parseDouble(jsonObject.get("O3").toString()); + } + } + }else { + continue; + } + if (!ObjectUtils.isEmpty(PM2_5) && !ObjectUtils.isEmpty(previousPM2_5)){ + Double difference_PM2_5 = PM2_5-previousPM2_5; + if (difference_PM2_5==0){ + PM2_5_change = "������"; + } + if (difference_PM2_5>0){ + PM2_5_change = "������"+difference_PM2_5; + } + if (difference_PM2_5<0){ + PM2_5_change = "������"+Math.abs(difference_PM2_5); + } + } + if (!ObjectUtils.isEmpty(PM10) && !ObjectUtils.isEmpty(previousPM10)){ + Double difference_PM10 = PM10-previousPM10; + if (difference_PM10==0){ + PM10_change = "������"; + } + if (difference_PM10>0){ + PM10_change = "������"+difference_PM10; + } + if (difference_PM10<0){ + PM10_change = "������"+Math.abs(difference_PM10); + } + } + if (!ObjectUtils.isEmpty(O3) && !ObjectUtils.isEmpty(previousO3)){ + Double difference_O3 = O3-previousO3; + if (difference_O3==0){ + O3_change = "������"; + } + if (difference_O3>0){ + O3_change = "������"+difference_O3; + } + if (difference_O3<0){ + O3_change = "������"+Math.abs(difference_O3); + } + } + //���������������������������������id + List<Integer> allOrgId = new ArrayList<>(); + allOrgId.add(orgId); + //������������ + //��������������� + List<Organization> allChildrenOrganization = organizationService.getChildrenOrganizationsById(orgId); + if (!ObjectUtils.isEmpty(allChildrenOrganization) || allChildrenOrganization.size() < 1){ + for (Organization organization:allChildrenOrganization) { + allOrgId.add(organization.getId()); + } + } + //������������ + List<Integer> allOrgIdWithoutDuplicates = allOrgId.stream().distinct().collect(Collectors.toList()); + //������������list���������������Mac + List<String> deviceMacList = new ArrayList<>(); + for (Integer orgIdWithoutDuplicates:allOrgIdWithoutDuplicates) { + //������id������������������ + QueryWrapper<Device> wrapper_device = new QueryWrapper<>(); + wrapper_device.eq("is_delete",Constants.NOT_DELETE).eq("organization_id",orgIdWithoutDuplicates); + List<Device> devices = new ArrayList<>(); + devices = deviceMapper.selectList(wrapper_device); + if (devices.size()>0){ + for (Device device:devices) { + String deviceMac = device.getMac(); + deviceMacList.add(deviceMac); + } + }else { + continue; + } + } + //������������ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String time = df.format(cityAqiList.get(i).getTime()); + if (deviceMacList.size()>0){ + List<HistoryHourly> valueByMacs = historyHourlyService.getValueByMacs(deviceMacList, time); + if (valueByMacs.size()>0){ + for (HistoryHourly historyHourly:valueByMacs) { + String value_historyHourly = historyHourly.getValue(); + if (!ObjectUtils.isEmpty(value_historyHourly)){ + JSONObject jsonObject = JSONObject.parseObject(value_historyHourly); + if (!ObjectUtils.isEmpty(jsonObject.get("a99054"))){ + TVOC = Double.parseDouble(jsonObject.get("a99054").toString()); + } + } + } + } + } + resultMap.put("time",time.substring(0,13)); + resultMap.put("title","���"+hour+"������������������"); + String PM2_5_string = subZeroAndDot(PM2_5.toString()); + String PM10_string = subZeroAndDot(PM10.toString()); + String O3_string = subZeroAndDot(O3.toString()); + String PM2_5_change_string = subZeroAndDot(PM2_5_change.toString()); + String PM10_change_string = subZeroAndDot(PM10_change.toString()); + String O3_change_string = subZeroAndDot(O3_change.toString()); + resultMap.put("info",hour+"������������AQI���"+AQI+"������������"+AQIIndex+"������"+previousHour+"������������PM10���"+PM10_string+"������/������������"+PM10_change_string+"���PM2.5���"+PM2_5_string+"������/������������"+PM2_5_change_string+"���TVOC���������"+String.format("%.2f", TVOC)+"������/������������O3���"+O3_string+"������/������������"+O3_change_string+"���"); + QueryWrapper<CityWeather> cityWeatherQueryWrapper = new QueryWrapper<>(); + cityWeatherQueryWrapper.eq("city_code",regionCode); + cityWeatherQueryWrapper.eq("time",cityAqiList.get(i).getTime()); + CityWeather cityWeather = cityWeatherService.getOne(cityWeatherQueryWrapper); + Integer temp = null; + Integer humidity = null; + String windDir = ""; + Integer windScale = null; + if (!ObjectUtils.isEmpty(cityWeather)){ + String cityWeatherValue = cityWeather.getValue(); + if (!ObjectUtils.isEmpty(cityWeatherValue)){ + JSONObject jsonObject = JSONObject.parseObject(cityWeatherValue); + if (!ObjectUtils.isEmpty(jsonObject.get("temp"))){ + temp = Integer.parseInt(jsonObject.get("temp").toString()); + } + if (!ObjectUtils.isEmpty(jsonObject.get("humidity"))){ + humidity = Integer.parseInt(jsonObject.get("humidity").toString()); + } + if (!ObjectUtils.isEmpty(jsonObject.get("windDir"))){ + windDir = jsonObject.get("windDir").toString(); + } + if (!ObjectUtils.isEmpty(jsonObject.get("windScale"))){ + windScale = Integer.parseInt(jsonObject.get("windScale").toString()); + } + } + } + String temp_string = ""; + if (temp!=null){ + temp_string = temp.toString(); + } + String humidity_string = ""; + if (humidity!=null){ + humidity_string = humidity.toString(); + } + String windScale_string = ""; + if (windScale!=null){ + windScale_string = windScale.toString(); + } + resultMap.put("weatherCondition","���������������������������"+temp_string+"������������"+humidity_string+"%,"+windDir+windScale_string+"������"); + resultMap.put("auther","���������������������������"); + resultList.add(resultMap); + } + Integer totel = count-1; + result.put("totel",totel); + result.put("resultList",resultList); + result.put("current",current); + int totalPageNumber = totel/size; + if(totel%size != 0){ + totalPageNumber += 1; + } + result.put("totalPageNumber",totalPageNumber); + return result; + } + + @Override + public Map<String, Object> countyData(Integer regionCode) { + Map<String,Object> resultMap = new HashMap<>(); + //������������ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH"); + Calendar calendar = Calendar.getInstance(); + int minute = calendar.get(Calendar.MINUTE); + if (minute >= 45){ + calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-1); + }else { + calendar.set(Calendar.HOUR_OF_DAY,calendar.get(Calendar.HOUR_OF_DAY)-2); + } + String time = df.format(calendar.getTime())+":00:00"; + QueryWrapper<CityAqi> cityAqiQueryWrapper = new QueryWrapper<>(); + cityAqiQueryWrapper.likeRight("city_code",regionCode.toString().substring(0,4)); + cityAqiQueryWrapper.ne("city_code",regionCode); + cityAqiQueryWrapper.eq("time",time); + List<CityAqi> cityAqis = cityAqiMapper.selectList(cityAqiQueryWrapper); + QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>(); + sysAreaQueryWrapper.eq("parent_code",regionCode); + List<SysArea> sysAreas = sysAreaMapper.selectList(sysAreaQueryWrapper); + Map<Integer, Object> sysAreaMap = new HashMap<>(); + for (SysArea sysarea:sysAreas) { + sysAreaMap.put(sysarea.getAreaCode(),sysarea.getAreaName()); + } + List<Map<String,Object>> resultList = new ArrayList<>(); + for (CityAqi cityAqi:cityAqis) { + if (!ObjectUtils.isEmpty(cityAqi.getValue())){ + Map<String, Object> cityAqiMap = new HashMap<>(); + String cityAqiValue = cityAqi.getValue(); + JSONObject jsonObject = JSONObject.parseObject(cityAqiValue); + String AQI = "--"; + String PM10 = "--"; + String PM2_5 = "--"; + String SO2 = "--"; + String NO2 = "--"; + String CO = "--"; + String O3 = "--"; + String thirty = "--"; + String forty = "--"; + String fifty = "--"; + String city_name = "--"; + if (!ObjectUtils.isEmpty(jsonObject.get("AQI"))){ + AQI = jsonObject.get("AQI").toString(); + BigDecimal AQI_base = BigDecimal.valueOf(Double.parseDouble(AQI)); + BigDecimal thirty_percent = BigDecimal.valueOf(1.3); + BigDecimal forty_percent = BigDecimal.valueOf(1.4); + BigDecimal fifty_percent = BigDecimal.valueOf(1.5); + Double AQI_thirty = AQI_base.multiply(thirty_percent).doubleValue(); + Double AQI_forty = AQI_base.multiply(forty_percent).doubleValue(); + Double AQI_fifty = AQI_base.multiply(fifty_percent).doubleValue(); + thirty = String.valueOf(Math.round(AQI_thirty)); + forty = String.valueOf(Math.round(AQI_forty)); + fifty = String.valueOf(Math.round(AQI_fifty)); + } + if (!ObjectUtils.isEmpty(jsonObject.get("PM10"))){ + PM10 = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("PM10").toString()))); + } + if (!ObjectUtils.isEmpty(jsonObject.get("PM2_5"))){ + PM2_5 = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("PM2_5").toString()))); + } + if (!ObjectUtils.isEmpty(jsonObject.get("SO2"))){ + SO2 = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("SO2").toString()))); + } + if (!ObjectUtils.isEmpty(jsonObject.get("NO2"))){ + NO2 = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("NO2").toString()))); + } + if (!ObjectUtils.isEmpty(jsonObject.get("CO"))){ + CO = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("CO").toString()))); + } + if (!ObjectUtils.isEmpty(jsonObject.get("O3"))){ + O3 = String.valueOf(Math.round(Double.parseDouble(jsonObject.get("O3").toString()))); + } + if (!ObjectUtils.isEmpty(jsonObject.get("cityName"))){ + city_name = jsonObject.get("cityName").toString(); + } + cityAqiMap.put("AQI",AQI); + cityAqiMap.put("PM10",PM10); + cityAqiMap.put("PM2_5",PM2_5); + cityAqiMap.put("SO2",SO2); + cityAqiMap.put("NO2",NO2); + cityAqiMap.put("CO",CO); + cityAqiMap.put("O3",O3); + cityAqiMap.put("thirty",thirty); + cityAqiMap.put("forty",forty); + cityAqiMap.put("fifty",fifty); + cityAqiMap.put("city_name",city_name); + resultList.add(cityAqiMap); + } + sysAreaMap.remove(cityAqi.getCityCode()); + } + if (sysAreaMap.size()>0){ + for(Integer key:sysAreaMap.keySet()){ + Map<String,Object> nullMap = new HashMap<>(); + nullMap.put("AQI","--"); + nullMap.put("PM10","--"); + nullMap.put("PM2_5","--"); + nullMap.put("SO2","--"); + nullMap.put("NO2","--"); + nullMap.put("CO","--"); + nullMap.put("O3","--"); + nullMap.put("thirty","--"); + nullMap.put("forty","--"); + nullMap.put("fifty","--"); + nullMap.put("city_name",sysAreaMap.get(key)); + resultList.add(nullMap); + } + } + resultMap.put("resultList",resultList); + resultMap.put("time",time); + QueryWrapper<SysArea> areaQueryWrapper = new QueryWrapper<>(); + areaQueryWrapper.eq("area_code",regionCode); + SysArea sysArea = sysAreaMapper.selectOne(areaQueryWrapper); + resultMap.put("areaName",sysArea.getAreaName()); + return resultMap; + } + + /** + * @Description: ������6������������������������������������ + * @Param: [data, comparisonData] + * @return: java.util.Map<java.lang.String, com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent> + * @Author: ��������� + * @Date: 2022/1/17 + */ + private Map<String, ConcentrationAndPercent> contrastSixParamAndComIndex(Map<String, Object> data, Map<String, Object> comparisonData) { + Map<String, ConcentrationAndPercent> result = new HashMap<>(); + result.put("CO", contrastParam(Double.parseDouble(data.get("CO").toString()), Double.parseDouble(comparisonData.get("CO").toString()), "CO")); + result.put("NO2", contrastParam(Double.parseDouble(data.get("NO2").toString()), Double.parseDouble(comparisonData.get("NO2").toString()), "NO2")); + result.put("SO2", contrastParam(Double.parseDouble(data.get("SO2").toString()), Double.parseDouble(comparisonData.get("SO2").toString()), "SO2")); + result.put("O3", contrastParam(Double.parseDouble(data.get("O3").toString()), Double.parseDouble(comparisonData.get("O3").toString()), "O3")); + result.put("PM2_5", contrastParam(Double.parseDouble(data.get("PM2_5").toString()), Double.parseDouble(comparisonData.get("PM2_5").toString()), "PM2_5")); + result.put("PM10", contrastParam(Double.parseDouble(data.get("PM10").toString()), Double.parseDouble(comparisonData.get("PM10").toString()), "PM10")); + result.put("compositeIndex", contrastParam(Double.parseDouble(data.get("compositeIndex").toString()), Double.parseDouble(comparisonData.get("compositeIndex").toString()), "compositeIndex")); + return result; + } + + /** + * @Description: ������6������������������������/��������������������� + * @Param: [data, comparisonData] + * @return: com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent + * @Author: ��������� + * @Date: 2022/1/17 + */ + private ConcentrationAndPercent contrastParam(Double data, Double comparisonData, String sensor) { + double percentD = MathUtils.division(data - comparisonData, comparisonData, 4); + String percent = MathUtils.mul(percentD,100d) + "%"; + ConcentrationAndPercent concentrationAndPercent = new ConcentrationAndPercent(); + concentrationAndPercent.setPercent(percent); + if (sensor.equals("CO")) {//CO��������������������� + Double CO = AmendUtils.sciCal(data, 1); + concentrationAndPercent.setConcentration(CO.toString()); + }else if (sensor.equals("compositeIndex")){ + concentrationAndPercent.setConcentration(data.toString()); + }else{ + Double sensorD = AmendUtils.sciCal(data, 0); + Integer sensorI = new Double(sensorD).intValue(); + concentrationAndPercent.setConcentration(sensorI.toString()); + } + return concentrationAndPercent; + } + + /** + * @Description: ��������������������������������� + * @Param: [days, comparisonDays] + * @return: com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent + * @Author: ��������� + * @Date: 2022/1/17 + */ + private ConcentrationAndPercent contrastDays(Integer days, Integer comparisonDays) { + ConcentrationAndPercent concentrationAndPercent = new ConcentrationAndPercent(); + concentrationAndPercent.setConcentration(days.toString()); + Integer result = days - comparisonDays; + concentrationAndPercent.setPercent(result.toString() + "���"); + return concentrationAndPercent; + } + + /** + * @Description: ���������������������������������6������������������������������������������������������������������������ + * @Param: [comparisonType, startDate, endDate, regionCode] + * @return: java.util.Map<java.lang.String , java.lang.Object> + * @Author: ��������� + * @Date: 2022/1/17 + */ + private Map<String, Object> getDataByTimeTypeAndRegionCode(String TimeType, Date startDate, Date endDate, Integer regionCode) { + Map<String, Object> data; + if (Constants.MONTH.equals(TimeType) && (!DateUtils.isCurrentMonth(startDate) || !DateUtils.isCurrentYear(startDate))) {//��������������� ��������������� + List<CityAqiMonthly> cityAqis = cityAqiMonthlyService.getCityAqiMonthByRegionCodeAndTime(regionCode, startDate, endDate); + if (ObjectUtils.isEmpty(cityAqis)) + return null; + data = JSON.parseObject(cityAqis.get(0).getValue(), Map.class); + } else if (Constants.YEAR.equals(TimeType) && (!DateUtils.isCurrentYear(startDate))) {//��������������� ��������������� + List<CityAqiYearly> cityAqis = cityAqiYearlyService.getCityAqiYearlyByRegionCodeAndTime(regionCode, startDate, endDate); + if (ObjectUtils.isEmpty(cityAqis)) + return null; + data = JSON.parseObject(cityAqis.get(0).getValue(), Map.class); + } else {//��������������������� + List<CityAqiDaily> cityAqis = cityAqiDailyService.getCityAqiDailyByRegionCodeAndTime(regionCode, startDate, endDate); + if (ObjectUtils.isEmpty(cityAqis)) + return null; + List<CityAqi> newCityAqis = new ArrayList<>(); + List<Map<String, Object>> dailyDataMaps = new ArrayList<>(); + cityAqis.forEach((value) -> { + newCityAqis.add(new CityAqi(value)); + dailyDataMaps.add(JSON.parseObject(value.getValue(), Map.class)); + }); + //������������ + data = calculate6ParamAvg(newCityAqis); + //��������������� + data.put("CO", Double.parseDouble(data.remove(Constants.SENSOR_CODE_CO).toString())); + data.put("NO2", Double.parseDouble(data.remove(Constants.SENSOR_CODE_NO2).toString())); + data.put("SO2", Double.parseDouble(data.remove(Constants.SENSOR_CODE_SO2).toString())); + data.put("O3", Double.parseDouble(data.remove(Constants.SENSOR_CODE_O3).toString())); + data.put("PM2_5", Double.parseDouble(data.remove(Constants.SENSOR_CODE_PM25).toString())); + data.put("PM10", Double.parseDouble(data.remove(Constants.SENSOR_CODE_PM10).toString())); + //������������������ + Double compositeIndex = ComprehensiveIndexUtils.dailyData(data); + data.put("compositeIndex", compositeIndex); + } + return data; + } + + //������������������ private void sortByField(List<Map<String, Object>> list, String sortField) { list.sort((o1, o2) -> { @@ -981,4 +1302,88 @@ } return result; } + + /** + * @Description: ��������������������������������������������������������� + * @Param: [regionType, regionCode] + * @return: java.util.List<com.moral.api.entity.SysArea> + * @Author: ��������� + * @Date: 2022/1/14 + */ + private List<SysArea> getSysAreasByRegionType(String regionType, Integer regionCode) { + List<SysArea> areas; + if (regionType.equals(Constants.TWENTY_EIGHT_CITIES)) { + areas = citiesProperties.getTwentyEightCities(); + } else { + areas = sysAreaService.getChildren(regionCode); + } + return areas; + } + + /** + * @Description: ������6������������ + * @Param: [cityAqiList] + * @return: java.util.Map<java.lang.String , java.lang.Double> + * ���������key���sensorCode,value������ + * @Author: ��������� + * @Date: 2021/11/2 + */ + private Map<String, Object> calculate6ParamAvg(List<CityAqi> cityAqiList) { + Double co = calculateSensorAvg(cityAqiList, "CO"); + Double pm2_5 = calculateSensorAvg(cityAqiList, "PM2_5"); + Double pm10 = calculateSensorAvg(cityAqiList, "PM10"); + Double so2 = calculateSensorAvg(cityAqiList, "SO2"); + Double no2 = calculateSensorAvg(cityAqiList, "NO2"); + Double o3 = calculateSensorAvg(cityAqiList, "O3"); + Map<String, Object> result = new HashMap<>(); + result.put(Constants.SENSOR_CODE_CO, co); + result.put(Constants.SENSOR_CODE_NO2, no2); + result.put(Constants.SENSOR_CODE_SO2, so2); + result.put(Constants.SENSOR_CODE_O3, o3); + result.put(Constants.SENSOR_CODE_PM25, pm2_5); + result.put(Constants.SENSOR_CODE_PM10, pm10); + return result; + } + + /** + * @Description: ������������������������ + * @Param: [cityAqiList, sensor] + * ���sensor��������������������������� + * @return: java.lang.Double + * @Author: ��������� + * @Date: 2021/11/2 + */ + private Double calculateSensorAvg(List<CityAqi> cityAqiList, String sensor) { + Double sum = 0d; + int num = 0; + for (CityAqi cityAqi : cityAqiList) { + String value = cityAqi.getValue(); + if (value == null) + continue; + Map<String, Object> valueMap = JSON.parseObject(value, Map.class); + Object sensorValueObject = valueMap.get(sensor); + if (sensorValueObject == null) + continue; + Double sensorValue = Double.valueOf(sensorValueObject.toString()); + sum = MathUtils.add(sum, sensorValue); + num++; + } + if (num == 0) + return null; + Double avg = MathUtils.division(sum, num, 2); + return avg; + } + + /** + * ������java������������������������������.���0 + * @param s + * @return + */ + public static String subZeroAndDot(String s){ + if(s.indexOf(".") > 0){ + s = s.replaceAll("0+?$", "");//���������������0 + s = s.replaceAll("[.]$", "");//������������������.��������� + } + return s; + } } -- Gitblit v1.8.0