From dcb98a36af4ad7823edd61a9c3388bd024db740f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 21 Aug 2023 14:33:13 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 86 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 77 insertions(+), 9 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 2075a95..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;
@@ -14,6 +15,7 @@
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;
@@ -85,6 +87,9 @@
private HistoryHourlyService historyHourlyService;
@Autowired
+ SpecialCitiesProperties citiesProperties;
+
+ @Autowired
private SysAreaMapper sysAreaMapper;
@Override
@@ -142,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) {
@@ -372,7 +405,7 @@
}
});
- //������������O3_8H������,������������O3_8H���������
+ //������������O3_8H������,������������O3������8H���������
if (!ObjectUtils.isEmpty(doubles)) {
dataMap.put("O3_8H", Collections.max(doubles));
}
@@ -634,7 +667,7 @@
/**
* @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
*/
@@ -1191,15 +1224,15 @@
*/
private ConcentrationAndPercent contrastParam(Double data, Double comparisonData, String sensor) {
double percentD = MathUtils.division(data - comparisonData, comparisonData, 4);
- String percent = MathUtils.mul(percentD, 100d) + "%";
+ 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")) {
+ }else if (sensor.equals("compositeIndex")){
concentrationAndPercent.setConcentration(data.toString());
- } else {
+ }else{
Double sensorD = AmendUtils.sciCal(data, 0);
Integer sensorI = new Double(sensorD).intValue();
concentrationAndPercent.setConcentration(sensorI.toString());
@@ -1225,7 +1258,7 @@
/**
* @Description: ���������������������������������6������������������������������������������������������������������������
* @Param: [comparisonType, startDate, endDate, regionCode]
- * @return: java.util.Map<java.lang.String, java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ���������
* @Date: 2022/1/17
*/
@@ -1309,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);
}
@@ -1320,7 +1352,7 @@
/**
* @Description: ������6������������
* @Param: [cityAqiList]
- * @return: java.util.Map<java.lang.String, java.lang.Double>
+ * @return: java.util.Map<java.lang.String , java.lang.Double>
* ���������key���sensorCode,value������
* @Author: ���������
* @Date: 2021/11/2
@@ -1383,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