From 3d665d84b1a4ffd6749ca9354247838ce0622f4b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 13 Dec 2022 13:47:53 +0800
Subject: [PATCH] 修改sql语句问题
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 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..68f32c2 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
@@ -14,6 +14,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;
@@ -83,6 +84,9 @@
@Autowired
private HistoryHourlyService historyHourlyService;
+
+ @Autowired
+ SpecialCitiesProperties citiesProperties;
@Autowired
private SysAreaMapper sysAreaMapper;
@@ -372,7 +376,7 @@
}
});
- //������������O3_8H������,������������O3_8H���������
+ //������������O3_8H������,������������O3������8H���������
if (!ObjectUtils.isEmpty(doubles)) {
dataMap.put("O3_8H", Collections.max(doubles));
}
@@ -634,7 +638,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 +1195,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 +1229,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 +1313,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 +1323,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
--
Gitblit v1.8.0