From 6cc2a1d726e1019079b6d3fa74599426a359c001 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 14:55:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-common/src/main/java/com/moral/util/AQIUtils.java | 16 ++++
screen-common/src/main/java/com/moral/util/DateUtils.java | 1
screen-common/src/main/java/com/moral/util/MathUtils.java | 16 +++++
screen-api/src/main/java/com/moral/api/service/CityAqiService.java | 10 +++
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 17 +++++
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 80 ++++++++++++++++++++++++++
6 files changed, 135 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AqiController.java b/screen-api/src/main/java/com/moral/api/controller/AqiController.java
index 062c508..640f34f 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AqiController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AqiController.java
@@ -66,8 +66,21 @@
*/
@GetMapping("query24HoursAQI")
public ResultMessage query24HoursAQIByRegionCode(Integer regionCode){
- Map<String, Object> stringObjectMap = cityAqiService.query24HoursAqiByRegionCode(regionCode);
- return ResultMessage.ok(stringObjectMap);
+ Map<String, Object> datas = cityAqiService.query24HoursAqiByRegionCode(regionCode);
+ return ResultMessage.ok(datas);
+ }
+
+ /**
+ * @Description: ���������������������aqi���������������������
+ * @Param: [RegionCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/2
+ */
+ @GetMapping("queryTodayAqiAndPollutant")
+ public ResultMessage queryTodayAqiAndPollutant(Integer regionCode){
+ Map<String, Object> datas = cityAqiService.queryTodayAqiAndPollutant(regionCode);
+ return ResultMessage.ok(datas);
}
@GetMapping("provincialRanking")
diff --git a/screen-api/src/main/java/com/moral/api/service/CityAqiService.java b/screen-api/src/main/java/com/moral/api/service/CityAqiService.java
index c5aa362..0bcc2ff 100644
--- a/screen-api/src/main/java/com/moral/api/service/CityAqiService.java
+++ b/screen-api/src/main/java/com/moral/api/service/CityAqiService.java
@@ -39,4 +39,14 @@
* @Date: 2021/11/1
*/
Map<String,Object> query24HoursAqiByRegionCode(Integer regionCode);
+
+ /**
+ * @Description: ���������������������AQI���������������������
+ * @Param: [regionCode]
+ * @return: java.util.Map<java.lang.String,java.lang.Object>���
+ * MAP���������KEY���������������������������(pollutant)���������(time)���������AQI(aqi)
+ * @Author: ���������
+ * @Date: 2021/11/2
+ */
+ Map<String,Object> queryTodayAqiAndPollutant(Integer regionCode);
}
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 9a8bd56..ca1f74d 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
@@ -15,11 +15,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.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;
@@ -178,10 +180,86 @@
return result;
}
+ @Override
+ public Map<String, Object> queryTodayAqiAndPollutant(Integer regionCode) {
+ //���������������9���������
+ Date startDate = new Date(DateUtils.getTodayTime());
+ Date endDate = new Date();
+ //������������������
+ QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
+ 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);
+ //���������������������
+ CityAqi lastCityAqi = cityAqis.get(cityAqis.size() - 1);
+ 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);
+ 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
*/
diff --git a/screen-common/src/main/java/com/moral/util/AQIUtils.java b/screen-common/src/main/java/com/moral/util/AQIUtils.java
index 592eadc..a55c8f5 100644
--- a/screen-common/src/main/java/com/moral/util/AQIUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AQIUtils.java
@@ -59,7 +59,7 @@
}
/**
- * @Description: ������AQI���������������
+ * @Description: ������AQI������������������map���key���sensorCode���value���������
* @Param: [map]
* @return: java.util.Map<java.lang.String,java.lang.Object>
* @Author: ���������
@@ -126,10 +126,22 @@
}
Map<String,Object> resultMap = new HashMap<>();
resultMap.put("aqi",AQIMAX);
- resultMap.put("pollutant",nameList);
+ if(AQIMAX>50)
+ resultMap.put("pollutant",nameList);
return resultMap;
}
+ public static void main(String[] args) {
+ Map<String,Object> map = new HashMap<>();
+ map.put("a34004",11.25);
+ map.put("a34002",18.25);
+ map.put("a21026",55);
+ map.put("a21004",200.01);
+ map.put("a21005",18.94);
+ map.put("a05024",55);
+ System.out.println(hourlyAqi_pollutant(map));
+ }
+
/**
* @Description: ������AQI������������
* @Param:
diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java
index add1279..3c1c89e 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -1117,6 +1117,7 @@
return todayStart.getTime().getTime();
}
+
public static Integer getTodayInt() {
return (int) (getTodayTime() / 1000);
}
diff --git a/screen-common/src/main/java/com/moral/util/MathUtils.java b/screen-common/src/main/java/com/moral/util/MathUtils.java
index f067ff7..54f58a9 100644
--- a/screen-common/src/main/java/com/moral/util/MathUtils.java
+++ b/screen-common/src/main/java/com/moral/util/MathUtils.java
@@ -50,4 +50,20 @@
BigDecimal b2 = new BigDecimal(Double.toString(v2));
return b1.multiply(b2).doubleValue();
}
+
+ /**
+ * @Description: ���������accurate������������������
+ * @Param: [a, b, accurate]
+ * @return: double
+ * @Author: ���������
+ * @Date: 2021/11/2
+ */
+ public static double division(double a, double b,int accurate) {
+ if (accurate < 0) {
+ throw new RuntimeException("���������������������������������");
+ }
+ BigDecimal b1 = new BigDecimal(a);
+ BigDecimal b2 = new BigDecimal(b);
+ return b1.divide(b2, accurate, BigDecimal.ROUND_HALF_UP).doubleValue();
+ }
}
--
Gitblit v1.8.0