From ea1373d4e1511b620bb87872e692643e2edb81f8 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 12 Sep 2023 10:29:19 +0800
Subject: [PATCH] fix:升级语句优化
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 149 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 119 insertions(+), 30 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 68f32c2..2f04c25 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,15 +1,14 @@
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;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.properties.SpecialCitiesProperties;
+import com.moral.api.dto.CityAqiDailyListDTO;
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.mapper.SysAreaMapper;
+import com.moral.api.mapper.*;
import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;
import com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent;
import com.moral.api.pojo.form.aqi.AirQualityComparisonForm;
@@ -27,6 +26,7 @@
import com.moral.util.MathUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -51,6 +51,8 @@
@Autowired
private CityAqiMapper cityAqiMapper;
+ @Autowired
+ private CityAqiDailyMapper cityAqiDailyMapper;
@Autowired
private ForecastMapper forecastMapper;
@@ -147,6 +149,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) {
Map<String, Object> value = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.CITY_AQI, String.valueOf(regionCode));
@@ -179,7 +209,7 @@
@Override
public Map<String, Object> query24HoursAqiByRegionCode(Integer regionCode) {
//������������������������������������������������������
- QueryWrapper<CityAqi> lastDataWrapper = new QueryWrapper<>();
+ /*QueryWrapper<CityAqi> lastDataWrapper = new QueryWrapper<>();
lastDataWrapper.eq("city_code", regionCode);
lastDataWrapper.orderByDesc("time");
lastDataWrapper.last(true, "limit 1");
@@ -192,39 +222,33 @@
//������������
QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
wrapper.between("time", startDate, endDate);
- wrapper.eq("city_code", regionCode);
- List<CityAqi> cityAqis = cityAqiMapper.selectList(wrapper);
+ wrapper.eq("city_code", regionCode);*/
+ List<CityAqi> cityAqis = cityAqiMapper.listCity(regionCode);
//������������������24���������������
- if (cityAqis.size() != 24) {
- Map<Date, CityAqi> dateCityAqiMap = new HashMap<>();
- cityAqis.forEach(value -> dateCityAqiMap.put(value.getTime(), value));
+ if(CollectionUtils.isEmpty(cityAqis)){
+ return new HashMap<>();
+ }
+ Date startDate = cityAqis.get(0).getTime();
+ if(cityAqis.size()<24){
for (int i = 0; i < 24; i++) {
- Date date = DateUtils.addHours(startDate, i);
- CityAqi cityAqi1 = dateCityAqiMap.get(date);
- if (cityAqi1 == null) {
+ Date dateTime = DateUtils.addHours(startDate, i);
+ if(cityAqis.size()-1 <i){
CityAqi newCityAqi = new CityAqi();
- newCityAqi.setTime(date);
+ newCityAqi.setTime(dateTime);
+ newCityAqi.setValue("0");
cityAqis.add(newCityAqi);
+ continue;
}
}
- //������������������������
- cityAqis.sort(Comparator.comparing(CityAqi::getTime));
}
+ //������������������������
+ cityAqis.sort(Comparator.comparing(CityAqi::getTime));
+
//������������������,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(), "yyyy-MM-dd HH:mm");
- String allDataJson = aqi.getValue();
- if (allDataJson == null) {
- result.put(key, "");
- continue;
- }
- Map<String, Object> allDataMap = JSON.parseObject(allDataJson, Map.class);
- Object aqiData = allDataMap.get("AQI");
- if (aqiData == null)
- result.put(key, "");
- else
- result.put(key, aqiData);
+ result.put(key,aqi.getValue());
}
return result;
}
@@ -663,13 +687,34 @@
Date now = new Date();
//������
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 dateString = DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN);
String s = String.valueOf(regionCode);
//���������,���code
Integer provinceCode = Integer.parseInt(s.substring(0, 2) + "0000");
Integer cityCode = Integer.parseInt(s.substring(0, 4) + "00");
- //������������������city_code
+ Map<String,Object> params = new HashMap<>();
+ params.put("cityCode",provinceCode);
+ params.put("start",dateString);
+ params.put("end",dateString);
+ params.put("type",1);
+ List<CityAqiDailyListDTO> dayList = cityAqiDailyMapper.CityAqiDailyMap(params);
+ String start = DateUtils.dateToDateString(DateUtils.addMonths(DateUtils.getFirstDayOfLastMonth(), 1));
+ params.put("start",start);
+ params.put("type",2);
+ List<CityAqiDailyListDTO> monList = cityAqiDailyMapper.CityAqiDailyMap(params);
+ start =DateUtils.dateToDateString(now, DateUtils.yyyy);
+ params.put("start",start);
+ params.put("end",start);
+ params.put("type",3);
+ List<CityAqiDailyListDTO> yearList = cityAqiDailyMapper.CityAqiDailyMap(params);
+ int indexDay = dayList.stream().map(CityAqiDailyListDTO::getCityCode).collect(Collectors.toList()).indexOf(cityCode.toString());
+ int indexMon = monList.stream().map(CityAqiDailyListDTO::getCityCode).collect(Collectors.toList()).indexOf(cityCode.toString());
+ int indexYear = yearList.stream().map(CityAqiDailyListDTO::getCityCode).collect(Collectors.toList()).indexOf(cityCode.toString());
+ result.put("day",mapResult(dayList,indexDay));
+ result.put("month",mapResult(monList,indexMon));
+ result.put("year",mapResult(yearList,indexYear));
+ /* //������������������city_code
QueryWrapper<SysArea> wrapper = new QueryWrapper<>();
wrapper.select("area_code").eq("parent_code", provinceCode);
List<Object> cityCodes = sysAreaService.listObjs(wrapper);
@@ -757,11 +802,19 @@
yearMap.put("size", null);
}
yearMap.put("compositeIndex", yearMap.remove("value"));
- result.put("year", yearMap);
+ result.put("year", yearMap);*/
//���������������
result.put("time", DateUtils.dateToDateString(yesterday, DateUtils.yyyy_MM_dd_EN));
return result;
+ }
+
+ private Map<String,Object> mapResult(List<CityAqiDailyListDTO> list, int length){
+ Map<String,Object> map = new HashMap<>();
+ map.put("AQI",CollectionUtils.isNotEmpty(list)&&length>0&&Objects.nonNull(list.get(length-1))?list.get(length-1).getAqi():0);
+ map.put("rank",CollectionUtils.isNotEmpty(list)&&length>0?length:0);
+ map.put("size",CollectionUtils.isNotEmpty(list)&&length>0?list.size():0);
+ return map;
}
@Override
@@ -1386,4 +1439,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