From cabcede1bffdcc5fbf464f5285ffeedde88e448c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Feb 2022 16:53:16 +0800
Subject: [PATCH] 督办图片上传
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
index a2cf89e..2ef07d2 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
@@ -10,16 +10,16 @@
import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;
import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
import com.moral.api.pojo.dto.cityAQI.PollutionDaysAndProportion;
-import com.moral.api.pojo.form.aqi.AreaPollutionLevelForm;
-import com.moral.api.pojo.form.aqi.ProvinceCitiesPollutionLevelForm;
-import com.moral.api.pojo.form.aqi.SpecialCitiesPollutionLevelForm;
+import com.moral.api.pojo.form.aqi.*;
import com.moral.api.pojo.vo.cityAQI.PieChartOfPollutionLevelVO;
-import com.moral.api.pojo.form.aqi.ChartOfPollutionLevelForm;
import com.moral.api.service.CityAqiDailyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.CityAqiMonthlyService;
+import com.moral.api.service.CityAqiYearlyService;
import com.moral.api.service.SysAreaService;
import com.moral.constant.Constants;
import com.moral.util.AQIUtils;
+import com.moral.util.ComprehensiveIndexUtils;
import com.moral.util.DateUtils;
import com.moral.util.MathUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +46,14 @@
SysAreaService sysAreaService;
@Autowired
SpecialCitiesProperties specialCitiesProperties;
+
+ @Override
+ public List<CityAqiDaily> getCityAqiDailyByRegionCodeAndTime(Integer regionCode, Date startDate, Date endDate) {
+ QueryWrapper<CityAqiDaily> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("city_code",regionCode);
+ queryWrapper.between("time",startDate,endDate);
+ return cityAqiDailyMapper.selectList(queryWrapper);
+ }
@Override
public PieChartOfPollutionLevelVO queryPieChartOfPollutionLevels(ChartOfPollutionLevelForm form) {
@@ -301,7 +309,7 @@
List<CityPollutionLevel> datas = new ArrayList<>();
//��������������������� ������������
for (SysArea area : allAreas) {
- CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndCityCode(area,startDate,endDate);
+ CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndSysArea(area, startDate, endDate);
datas.add(cityPollutionLevel);
}
return datas;
@@ -317,7 +325,7 @@
List<CityPollutionLevel> datas = new ArrayList<>();
//��������������������� ������������
for (SysArea area : areas) {
- CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndCityCode(area,startDate,endDate);
+ CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndSysArea(area, startDate, endDate);
datas.add(cityPollutionLevel);
}
return datas;
@@ -335,26 +343,30 @@
List<CityPollutionLevel> datas = new ArrayList<>();
//��������������������� ������������
for (SysArea city : allCities) {
- CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndCityCode(city,startDate,endDate);
+ CityPollutionLevel cityPollutionLevel = calculateDaysByTimeAndSysArea(city, startDate, endDate);
datas.add(cityPollutionLevel);
}
return datas;
}
+
/**
- * @Description: ���������������������������������������������������������
- * @Param: [area, startDate, endDate]
- * @return: com.moral.api.pojo.dto.cityAQI.CityPollutionLevel
- * @Author: ���������
- * @Date: 2021/12/31
- */
- private CityPollutionLevel calculateDaysByTimeAndCityCode(SysArea area, Date startDate, Date endDate) {
+ * @Description: ���������������������������������������������������������
+ * @Param: [area, startDate, endDate]
+ * @return: com.moral.api.pojo.dto.cityAQI.CityPollutionLevel
+ * @Author: ���������
+ * @Date: 2021/12/31
+ */
+ @Override
+ public CityPollutionLevel calculateDaysByTimeAndSysArea(SysArea area, Date startDate, Date endDate) {
//������������
QueryWrapper<CityAqiDaily> wrapper = new QueryWrapper<>();
wrapper.eq("city_code", area.getAreaCode());
wrapper.between("time", startDate, endDate);
wrapper.orderByAsc("time");
List<CityAqiDaily> cityAqiDailies = cityAqiDailyMapper.selectList(wrapper);
+ if(ObjectUtils.isEmpty(cityAqiDailies))
+ return null;
//���������������������������������������
Map<String, CityAqiDaily> tmpMap = new LinkedHashMap<>();
for (CityAqiDaily cityAqiDaily : cityAqiDailies) {
@@ -392,4 +404,9 @@
return cityPollutionLevel;
}
+
+
+
+
}
+
--
Gitblit v1.8.0