From 8dce9a3ac3d04150a8656219b32f0bdda445ab2c Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 14 Mar 2022 17:13:43 +0800
Subject: [PATCH] 环比数据接口修改
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 766 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 606 insertions(+), 160 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 eb93995..a701188 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,18 @@
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.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.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;
@@ -35,6 +31,7 @@
import org.springframework.util.ObjectUtils;
import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
@@ -60,9 +57,6 @@
private RedisTemplate redisTemplate;
@Autowired
- private OrganizationService organizationService;
-
- @Autowired
private SysAreaService sysAreaService;
@Autowired
@@ -73,6 +67,21 @@
@Autowired
private CityAqiYearlyService cityAqiYearlyService;
+
+ @Autowired
+ private SpecialCitiesProperties specialCitiesProperties;
+
+ @Autowired
+ private CityWeatherService cityWeatherService;
+
+ @Autowired
+ private OrganizationService organizationService;
+
+ @Autowired
+ private DeviceMapper deviceMapper;
+
+ @Autowired
+ private HistoryHourlyService historyHourlyService;
@Override
public List<Map<String, Object>> measuredCompareForecastOfO3(Map<String, Object> params) {
@@ -135,6 +144,21 @@
Map<String, Object> value = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.CITY_AQI, String.valueOf(regionCode));
if (value == null)
value = queryCityAqiByRegionCodeFromDB(regionCode);
+ //������������������������������������������������������������
+ if (value == null) {
+ String regionCodeStr = String.valueOf(regionCode);
+ String end = regionCodeStr.substring(regionCodeStr.length() - 2, regionCodeStr.length());
+ if (!end.equals(00)) {
+ regionCodeStr = regionCodeStr.substring(0, regionCodeStr.length() - 2);
+ regionCodeStr += "00";
+ regionCode = Integer.parseInt(regionCodeStr);
+ value = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.CITY_AQI, String.valueOf(regionCode));
+ if (value == null)
+ value = queryCityAqiByRegionCodeFromDB(regionCode);
+ } else {
+ return null;
+ }
+ }
//������AQI������������������
if (value == null || value.get("AQI") == null)
return null;
@@ -152,6 +176,8 @@
lastDataWrapper.orderByDesc("time");
lastDataWrapper.last(true, "limit 1");
CityAqi cityAqi = cityAqiMapper.selectOne(lastDataWrapper);
+ if (cityAqi == null)
+ return null;
//���������24������������������
Date endDate = cityAqi.getTime();
Date startDate = DateUtils.addHours(endDate, -23);
@@ -176,10 +202,10 @@
//������������������������
cityAqis.sort(Comparator.comparing(CityAqi::getTime));
}
- //������������������,map���key���HH:mm������������������value���aqi���������
+ //������������������,map���key���yyyy-MM-dd HH:mm������������������value���aqi���������
Map<String, Object> result = new LinkedHashMap<>();
for (CityAqi aqi : cityAqis) {
- String key = DateUtils.dateToDateString(aqi.getTime(), "HH:mm");
+ String key = DateUtils.dateToDateString(aqi.getTime(), "yyyy-MM-dd HH:mm");
String allDataJson = aqi.getValue();
if (allDataJson == null) {
result.put(key, "");
@@ -223,7 +249,7 @@
@Override
public List<Map<String, Object>> rankingDetails(Map<String, Object> params) {
List<Map<String, Object>> result = new ArrayList<>();
- int orgId = Integer.parseInt(params.get("organizationId").toString());
+ int regionCode = Integer.parseInt(params.get("regionCode").toString());
String type = params.get("type").toString();
String time = null;
if (!ObjectUtils.isEmpty(params.get("time"))) {
@@ -237,45 +263,52 @@
}
String cityType = params.get("cityType").toString();
- //���������,���code
- Organization organization = organizationService.getById(orgId);
- Integer curProvinceCode = organization.getProvinceCode();
- Integer curCityCode = organization.getCityCode();
+ String s = String.valueOf(regionCode);
+ //���������������,���code
+ Integer curProvinceCode = Integer.parseInt(s.substring(0, 2) + "0000");
+ 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;
@@ -284,10 +317,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();
@@ -298,7 +335,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) {
@@ -349,7 +386,7 @@
List<String> primaryPollutantNames = aqi.getPrimaryPollutantNames();
String primaryPollutant = "";
if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
- primaryPollutant = primaryPollutantNames.toString().replace("[", "").replace("]", "");
+ primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
}
dataMap.put("primaryPollutant", primaryPollutant);
@@ -360,22 +397,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")
@@ -387,7 +429,7 @@
List<String> primaryPollutantNames = (List<String>) value.get("primaryPollutant");
String primaryPollutant = "";
if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
- primaryPollutant = primaryPollutantNames.toString().replace("[", "").replace("]", "");
+ primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
}
value.put("primaryPollutant", primaryPollutant);
value.remove("pubtime");
@@ -398,11 +440,15 @@
}
/**
- * @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")
@@ -414,33 +460,40 @@
List<String> primaryPollutantNames = (List<String>) value.get("primaryPollutant");
String primaryPollutant = "";
if (!ObjectUtils.isEmpty(primaryPollutantNames)) {
- primaryPollutant = primaryPollutantNames.toString().replace("[", "").replace("]", "");
+ primaryPollutant = primaryPollutantNames.stream().map(String::valueOf).collect(Collectors.joining(","));
}
value.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);
+ for (SysArea sysArea : sysAreas) {
+ if (dayDatum.get("city_code").equals(sysArea.getAreaCode())) {
+ value.put("cityName", sysArea.getAreaName());
+ break;
+ }
+ }
result.add(value);
}
return result;
}
/**
- * @param regionCodes ���������������������������������
- * @param time ��������������������������� 2021-11-01 00:00:00 ������1���
+ * @param sysAreas ������������������������
+ * @param time ��������������������������� 2021-11-01 00:00:00 ������1���
* @return ������������������
*/
- private List<Map<String, Object>> monthRank(List<Object> regionCodes, String time) {
+ private List<Map<String, Object>> monthRank(List<SysArea> sysAreas, String time) {
+ 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<>();
- //���������������,������������������������������city_aqi_monthly������
+ //������������������,������������������������������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) {
+ for (Integer regionCode : regionCodes) {
cityAqiMonthlyQueryWrapper.clear();
cityAqiMonthlyQueryWrapper.select("value")
.eq("city_code", regionCode)
@@ -451,13 +504,15 @@
}
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);
+ for (SysArea sysArea : sysAreas) {
+ if (regionCode.equals(sysArea.getAreaCode())) {
+ resultMap.put("cityName", sysArea.getAreaName());
+ break;
+ }
+ }
}
return result;
}
@@ -468,7 +523,9 @@
.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()));
+ 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<>();
@@ -539,30 +596,34 @@
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 (cityCode.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) {
+ private List<Map<String, Object>> yearRank(List<SysArea> sysAreas, String time) {
+ 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<>();
//���������������,������������������������������city_aqi_monthly������
if (!time.substring(0, 4).equals(DateUtils.dateToDateString(new Date(), DateUtils.yyyy))) {
QueryWrapper<CityAqiYearly> cityAqiYearlyQueryWrapper = new QueryWrapper<>();
- for (Object regionCode : regionCodes) {
+ for (Integer regionCode : regionCodes) {
cityAqiYearlyQueryWrapper.clear();
cityAqiYearlyQueryWrapper.select("value")
.eq("city_code", regionCode)
@@ -573,12 +634,15 @@
}
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);
+ for (SysArea sysArea : sysAreas) {
+ if (regionCode.equals(sysArea.getAreaCode())) {
+ resultMap.put("cityName", sysArea.getAreaName());
+ break;
+ }
+ }
result.add(resultMap);
}
return result;
@@ -590,7 +654,8 @@
.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()));
+ 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<>();
@@ -659,24 +724,31 @@
yearContrast = decimalFormat.format((compositeIndex - lastCompositeIndex) / lastCompositeIndex);
}
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);
+
+ //���������
+ for (SysArea sysArea : sysAreas) {
+ if (cityCode.equals(sysArea.getAreaCode())) {
+ resultMap.put("cityName", sysArea.getAreaName());
+ break;
+ }
+ }
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<>();
@@ -687,7 +759,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<>();
@@ -741,74 +814,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
*/
@@ -826,7 +847,7 @@
}
@Override
- public Map<String, Object> provincialRanking(Integer organizationId) {
+ public Map<String, Object> provincialRanking(Integer regionCode) {
//���������
Map<String, Object> result = new HashMap<>();
@@ -835,10 +856,10 @@
Date yesterday = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), DateUtils.yyyy_MM_dd_EN);
String dateString = DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ String s = String.valueOf(regionCode);
//���������,���code
- Organization organization = organizationService.getById(organizationId);
- Integer provinceCode = organization.getProvinceCode();
- Integer cityCode = organization.getCityCode();
+ Integer provinceCode = Integer.parseInt(s.substring(0, 2) + "0000");
+ Integer cityCode = Integer.parseInt(s.substring(0, 4) + "00");
//������������������city_code
QueryWrapper<SysArea> wrapper = new QueryWrapper<>();
wrapper.select("area_code").eq("parent_code", provinceCode);
@@ -921,8 +942,6 @@
//������������������������������
sortByField(ranks, "compositeIndexYear");
- //���������������
- sortByField(ranks, "compositeIndexYear");
Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
if (ObjectUtils.isEmpty(yearMap)) {
yearMap.put("rank", null);
@@ -935,6 +954,363 @@
result.put("time", DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN));
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 List<Map<String, Object>> momData(Integer regionCode, Integer size, Integer current, Integer orgId) {
+ 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);
+ 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 resultList;
+ }
+ 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+"������������������");
+ resultMap.put("info",hour+"������������AQI���"+AQI+"������������"+AQIIndex+"������"+previousHour+"������������PM10���"+PM10+"������/������������"+PM10_change+"���PM2_5���"+PM2_5+"������/������������"+PM2_5_change+"���TVOC���������"+TVOC+"������/������������O3���"+O3+"������/������������"+O3_change+"���");
+ QueryWrapper<CityWeather> cityWeatherQueryWrapper = new QueryWrapper<>();
+ cityWeatherQueryWrapper.eq("city_code",regionCode);
+ cityWeatherQueryWrapper.eq("time",cityAqiList.get(i).getTime());
+ CityWeather cityWeather = cityWeatherService.getOne(cityWeatherQueryWrapper);
+ Double temp = null;
+ Double humidity = null;
+ String windDir = null;
+ Integer windScale = null;
+ String cityWeatherValue = cityWeather.getValue();
+ if (!ObjectUtils.isEmpty(cityWeatherValue)){
+ JSONObject jsonObject = JSONObject.parseObject(cityWeatherValue);
+ if (!ObjectUtils.isEmpty(jsonObject.get("temp"))){
+ temp = Double.parseDouble(jsonObject.get("temp").toString());
+ }
+ if (!ObjectUtils.isEmpty(jsonObject.get("humidity"))){
+ humidity = Double.parseDouble(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());
+ }
+ }
+ resultMap.put("weatherCondition","���������������������������"+temp+"������������"+humidity+"%,"+windDir+windScale+"������");
+ resultMap.put("auther","���������������������������");
+ resultList.add(resultMap);
+ }
+ return resultList;
+ }
+
+ /**
+ * @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) {
@@ -967,5 +1343,75 @@
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)) {
+ SpecialCitiesProperties properties = new SpecialCitiesProperties();
+ areas = properties.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;
+ }
}
--
Gitblit v1.8.0