From 7dc80d58f30dd7155d9e6b70f64db086e6473e33 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 12:08:41 +0800
Subject: [PATCH] fix:实测补偿修复
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 450 +++++++++++++++++++++++++++----------------------------
1 files changed, 220 insertions(+), 230 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 6f08c33..10d5f6d 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
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.alibaba.excel.util.StringUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,10 +10,12 @@
import com.moral.api.mapper.CityAqiMapper;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.ForecastMapper;
+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.constant.Constants;
@@ -30,7 +33,7 @@
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;
@@ -82,6 +85,12 @@
@Autowired
private HistoryHourlyService historyHourlyService;
+
+ @Autowired
+ SpecialCitiesProperties citiesProperties;
+
+ @Autowired
+ private SysAreaMapper sysAreaMapper;
@Override
public List<Map<String, Object>> measuredCompareForecastOfO3(Map<String, Object> params) {
@@ -138,6 +147,34 @@
}
return result;
}
+
+
+ @Override
+ public List<Map<String, Object>> measuredCompareForecastOfO3_8H(Map<String, Object> params) {
+ String regionCode = params.get("regionCode").toString();
+ String time = params.get("time").toString();
+ Date endTime = DateUtils.getDate(time+" "+"23:00:00",DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ Date startDate = DateUtils.getDate(time+" "+"00:00:00",DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ Date startTime = DateUtils.addHours(startDate,-7);
+ //������������
+ QueryWrapper<Forecast> forecastQueryWrapper = new QueryWrapper<>();
+ forecastQueryWrapper.select("time", "value")
+ .eq("city_code", regionCode)
+ .between("time",startTime,endTime)
+ .orderByAsc("time");
+ List<Map<String, Object>> forecastData = forecastMapper.selectMaps(forecastQueryWrapper);
+ //������������
+ QueryWrapper<CityAqi> cityAqiQueryWrapper = new QueryWrapper<>();
+ cityAqiQueryWrapper.select("time", "value")
+ .eq("city_code", regionCode)
+ .between("time",startTime,endTime).orderByAsc("time");
+ List<Map<String, Object>> measuredData = cityAqiMapper.selectMaps(cityAqiQueryWrapper);
+
+ List<Map<String, Object>> result = getO3_8H(forecastData,0,time);
+ result.addAll(getO3_8H(measuredData,1,time));
+ return result;
+ }
+
@Override
public Map<String, Object> queryCityAqiByRegionCode(Integer regionCode) {
@@ -454,32 +491,33 @@
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);
//���������
for (SysArea sysArea : sysAreas) {
- if (dayDatum.get("city_code").equals(sysArea.getAreaCode())) {
- value.put("cityName", sysArea.getAreaName());
+ if (cityAqiDaily.getCityCode().equals(sysArea.getAreaCode())) {
+ resultMap.put("cityName", sysArea.getAreaName());
break;
}
}
- result.add(value);
+ result.add(resultMap);
}
return result;
}
/**
* @param sysAreas ������������������������
- * @param time ��������������������������� 2021-11-01 00:00:00 ������1���
+ * @param time ��������������������������� 2021-11-01 00:00:00
* @return ������������������
*/
private List<Map<String, Object>> monthRank(List<SysArea> sysAreas, String time) {
@@ -487,123 +525,24 @@
.map(SysArea::getAreaCode)
.collect(Collectors.toList());
- //���������������������������
- List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2");
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 (Integer 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);
-
-
- //���������
- for (SysArea sysArea : sysAreas) {
- if (regionCode.equals(sysArea.getAreaCode())) {
- resultMap.put("cityName", sysArea.getAreaName());
- break;
- }
- }
- }
- 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<Integer, List<Map<String, Object>>> thisMonthMap = thisMonthData.parallelStream()
- .collect(Collectors.groupingBy(o -> Integer.parseInt(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);
-
//���������
for (SysArea sysArea : sysAreas) {
- if (cityCode.equals(sysArea.getAreaCode())) {
+ if (cityAqiMonthly.getCityCode().equals(sysArea.getAreaCode())) {
resultMap.put("cityName", sysArea.getAreaName());
break;
}
}
result.add(resultMap);
- });
+ }
return result;
}
@@ -617,124 +556,23 @@
.map(SysArea::getAreaCode)
.collect(Collectors.toList());
- //���������������������������
- List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2");
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 (Integer 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);
-
-
- //���������
- for (SysArea sysArea : sysAreas) {
- if (regionCode.equals(sysArea.getAreaCode())) {
- resultMap.put("cityName", sysArea.getAreaName());
- break;
- }
- }
- 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<Integer, List<Map<String, Object>>> thisYearMap = thisMonthData.parallelStream()
- .collect(Collectors.groupingBy(o -> Integer.parseInt(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);
- }
- resultMap.put("yearContrast", yearContrast);
-
-
- //���������
for (SysArea sysArea : sysAreas) {
- if (cityCode.equals(sysArea.getAreaCode())) {
+ if (cityAqiYearly.getCityCode().equals(sysArea.getAreaCode())) {
resultMap.put("cityName", sysArea.getAreaName());
break;
}
}
result.add(resultMap);
- });
+ }
return result;
}
@@ -1241,10 +1079,127 @@
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>
+ * @return: java.util.Map<java.lang.String, com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent>
* @Author: ���������
* @Date: 2022/1/17
*/
@@ -1387,8 +1342,7 @@
private List<SysArea> getSysAreasByRegionType(String regionType, Integer regionCode) {
List<SysArea> areas;
if (regionType.equals(Constants.TWENTY_EIGHT_CITIES)) {
- SpecialCitiesProperties properties = new SpecialCitiesProperties();
- areas = properties.getTwentyEightCities();
+ areas = citiesProperties.getTwentyEightCities();
} else {
areas = sysAreaService.getChildren(regionCode);
}
@@ -1461,4 +1415,40 @@
}
return s;
}
+
+ public List<Map<String, Object>> getO3_8H(List<Map<String, Object>> data , int type,String day) {
+ List<Map<String, Object>> list = new ArrayList<>();
+ for(int i = 0 ;i<=23;i++){
+ Map<String, Object> map = new HashMap<>();
+ if(type == 0){
+ map.put("type","������");
+ }else {
+ map.put("type","������");
+ }
+ String times = day+" "+i;
+ Date endDate = DateUtils.getDate(times,DateUtils.yyyy_MM_dd_HH_EN);
+ Date startDate = DateUtils.addHours(DateUtils.getDate(day+" "+i,DateUtils.yyyy_MM_dd_HH_EN),-7);
+ List<Double> value = new ArrayList<>();
+ for(Map<String, Object> m : data){
+ Date time = (Date) m.get("time");
+ if(DateUtils.isTimeBeforE(time,startDate) && DateUtils.isTimeBeforE(endDate,time)){
+ Map<String, Object> sensorValue = JSONObject.parseObject((String) m.get("value"), Map.class);
+ Double o3 = Double.parseDouble(sensorValue.get("O3").toString());
+ value.add(o3);
+
+ }
+ }
+ if (value.size() < 6) {
+ continue;
+ }
+ double average = value.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage();
+ map.put("O3", new BigDecimal(average).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
+ map.put("time",times);
+ list.add(map);
+ }
+
+ return list;
+
+ }
+
}
--
Gitblit v1.8.0