From 8f5416a1e507fe24c151648982e391fead13ffdd Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 15:57:22 +0800
Subject: [PATCH] 省内倒数排名增加time字段
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 82 +++++++++++++++++++++--------------------
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 36 ++++++++++++++++++
2 files changed, 78 insertions(+), 40 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 ca1f74d..930eb58 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
@@ -187,8 +187,8 @@
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);
//���������������
@@ -197,69 +197,69 @@
Map<String, Object> result = AQIUtils.hourlyAqi_pollutant(sixParamAvg);
//���������������������
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
*/
@@ -372,6 +372,8 @@
yearMap.put("compositeIndex", yearMap.remove("value"));
result.put("year", yearMap);
+ //���������������
+ result.put("time", DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN));
return result;
}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index 1250a50..1f91041 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -10,6 +10,9 @@
import com.moral.api.service.CityConfigService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
+import com.moral.util.AQIUtils;
+import com.moral.util.AmendUtils;
+import com.moral.util.ComprehensiveIndexUtils;
import com.moral.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +23,7 @@
import org.springframework.web.client.RestTemplate;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -79,6 +83,38 @@
aqi.put("co", aqi.remove("coC"));
aqi.put("o3", aqi.remove("o3C"));
aqi.put("aqi", aqi.remove("value"));
+
+ //o3���������������
+ //���������������������������o3������
+ QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("time", "value").eq("city_code", cityCode);
+ List<Map<String, Object>> cityAqis = cityAqiMapper.selectMaps(queryWrapper);
+ List<Map<String, Object>> o3_8H = AmendUtils.getO3_8H(cityAqis);
+ if (!ObjectUtils.isEmpty(o3_8H)) {
+ for (Map<String, Object> o3Map : o3_8H) {
+ String hourTime = o3Map.get("time").toString();
+ if (DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN).equals(hourTime)) {
+ o3Map.get("o3");
+ aqi.put("o3_8h", o3Map.get("o3"));
+ break;
+ }
+ }
+ }
+
+ //������������������
+ Map<String, Object> temp = new HashMap<>(aqi);
+ temp.put("o3", temp.get("o3_8h"));
+ Double compositeIndex = ComprehensiveIndexUtils.dailyData(temp);
+ aqi.put("compositeIndex", compositeIndex);
+
+
+ //���������������������
+ Map<String, Object> pollutant = AQIUtils.cityAqiPollutant(aqi);
+ if (!ObjectUtils.isEmpty(pollutant)) {
+ aqi.putAll(pollutant);
+ }
+
+
CityAqi cityAqi = new CityAqi();
cityAqi.setCityCode(cityCode);
cityAqi.setTime(time);
--
Gitblit v1.8.0