From 30c76f1f25ddf6437014ea47bdc206cf0e288ec7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 03 Nov 2021 14:23:09 +0800
Subject: [PATCH] screen-common 修改AQI工具类代码
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 105 +++++++++++++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 43 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 54b4316..352e2da 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
@@ -17,11 +17,13 @@
import com.moral.api.service.SysAreaService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
+import com.moral.pojo.AQI;
import com.moral.util.AQIUtils;
import com.moral.util.AmendUtils;
import com.moral.util.DateUtils;
import com.moral.util.MathUtils;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -187,79 +189,82 @@
Date endDate = new Date();
//������������������
QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
- wrapper.between("time",startDate,endDate);
- wrapper.eq("city_code",regionCode);
+ wrapper.between("time", startDate, endDate);
+ wrapper.eq("city_code", regionCode);
wrapper.select("DISTINCT city_code,time,value");
List<CityAqi> cityAqis = cityAqiMapper.selectList(wrapper);
//���������������
Map<String, Object> sixParamAvg = calculate6ParamAvg(cityAqis);
//������������aqi������������������
- Map<String, Object> result = AQIUtils.hourlyAqi_pollutant(sixParamAvg);
+ Map<String, Object> result = new HashMap<>();
+ AQI aqi = AQIUtils.hourlyAQI(sixParamAvg);
+ result.put("aqi",aqi.getAQIValue());
+ result.put("pollutant",aqi.getPrimaryPollutantNames());
//���������������������
CityAqi lastCityAqi = cityAqis.get(cityAqis.size() - 1);
- String time = DateUtils.dateToDateString(lastCityAqi.getTime(),"HH:mm");
- result.put("time",time);
+ String time = DateUtils.dateToDateString(lastCityAqi.getTime(), "HH:mm");
+ result.put("time", time);
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);
+ * @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){
+ * @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)
+ if (value == null)
continue;
- Map<String,Object> valueMap = JSON.parseObject(value,Map.class);
+ Map<String, Object> valueMap = JSON.parseObject(value, Map.class);
Object sensorValueObject = valueMap.get(sensor);
- if(sensorValueObject==null)
+ if (sensorValueObject == null)
continue;
Double sensorValue = Double.valueOf(sensorValueObject.toString());
- sum = MathUtils.add(sum,sensorValue);
+ sum = MathUtils.add(sum, sensorValue);
num++;
}
- if(num==0)
+ if (num == 0)
return null;
- Double avg = MathUtils.division(sum,num,2);
+ 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
*/
@@ -352,6 +357,10 @@
sortByField(ranks, "aqi");
//���������������
Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
+ if (ObjectUtils.isEmpty(dayMap)) {
+ dayMap.put("rank", null);
+ dayMap.put("size", null);
+ }
dayMap.put("aqi", dayMap.remove("value"));
result.put("day", dayMap);
@@ -360,18 +369,27 @@
sortByField(ranks, "compositeIndexMonth");
//���������������
Map<String, Object> monthMap = rankByField(ranks, cityCode, "compositeIndexMonth", cityCodes.size());
+ if (ObjectUtils.isEmpty(monthMap)) {
+ monthMap.put("rank", null);
+ monthMap.put("size", null);
+ }
monthMap.put("compositeIndex", monthMap.remove("value"));
result.put("month", monthMap);
-
//������������������������������
sortByField(ranks, "compositeIndexYear");
//���������������
sortByField(ranks, "compositeIndexYear");
Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
+ if (ObjectUtils.isEmpty(yearMap)) {
+ yearMap.put("rank", null);
+ yearMap.put("size", null);
+ }
yearMap.put("compositeIndex", yearMap.remove("value"));
result.put("year", yearMap);
+ //���������������
+ result.put("time", DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN));
return result;
}
@@ -396,7 +414,8 @@
Map<String, Object> map = list.get(i);
if (cityCode == (int) map.get("cityCode")) {
int rank = i + 1;
- result.put("rank", rank + "/" + size);
+ result.put("rank", rank);
+ result.put("size", size);
Object value = map.get(rankField);
result.put("value", value);
break;
--
Gitblit v1.8.0