From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
index 4beb266..a0c6711 100644
--- a/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
@@ -68,6 +68,9 @@
@Override
public Map<String, Object> getPollutionSourceDataByHour(Map<String, Object> parameters) throws Exception {
+ String yearAndDay = String.valueOf(parameters.get("yearAndDay"));
+ yearAndDay = yearAndDay.replace("-","");
+ parameters.put("yearAndDay",yearAndDay);
List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);
List<String> sensorKeys = new ArrayList<>();
for (Sensor sensor : sensors) {
@@ -90,6 +93,9 @@
@Override
public Map<String, Object> getPollutionSourceDataAll(Map<String, Object> parameters) throws Exception {
+ String yearAndDay = String.valueOf(parameters.get("yearAndDay"));
+ yearAndDay = yearAndDay.replace("-","");
+ parameters.put("yearAndDay",yearAndDay);
List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);
List<String> sensorKeys = new ArrayList<>();
for (Sensor sensor : sensors) {
@@ -295,7 +301,7 @@
timeOfHour=timeOfHour+1;
}
O3_8.put("time", String.valueOf(timeOfHour));
- O3_8.put("O3_8h", String.valueOf(avg1));
+ O3_8.put("O3-8h", String.valueOf(avg1));
mapList1.add(O3_8);
}else {
continue;
@@ -310,24 +316,25 @@
List<Map<String, String>> mapList1 = listArrayList.get(0);
List<Double> O3List = new ArrayList();
for (Map<String, String> stringStringMap : mapList1) {
- O3List.add(Double.parseDouble(stringStringMap.get("O3_8h")));
+ O3List.add(Double.parseDouble(stringStringMap.get("O3-8h")));
}
+
maxO3 = Collections.max(O3List);
for (int i = 0; i <dataAvbByMIdAndTime.size() ; i++) {
- dataAvbByMIdAndTime.get(i).put("O3_8h",null);
+ dataAvbByMIdAndTime.get(i).put("O3-8h",null);
int time = Integer.parseInt(((Object)dataAvbByMIdAndTime.get(i).get("time")).toString().substring(11,13)) ;
for (int j = 0; j <mapList1.size() ; j++) {
int time1 = Integer.parseInt(mapList1.get(j).get("time").toString()) ;
if (time==time1){
- Double O3_8h = Double.parseDouble(mapList1.get(j).get("O3_8h").toString());
- dataAvbByMIdAndTime.get(i).put("O3_8h",new BigDecimal(O3_8h).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
+ Double O3_8h = Double.parseDouble(mapList1.get(j).get("O3-8h").toString());
+ dataAvbByMIdAndTime.get(i).put("O3-8h",new BigDecimal(O3_8h).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
}
}
}
}
Map<String, Object> dailyAvgData = historyMapper.getDailyAvgData(mId, startTime);
if (dailyAvgData!=null){
- dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
+ dailyAvgData.put("maxO3-8h",new BigDecimal(maxO3).setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue());
dailyAvgData.put("time",startTime);
}
if (dataAvbByMIdAndTime.size()>24){
@@ -337,9 +344,9 @@
dataAvbByMIdAndTime.get(i).put("AQI",Double.parseDouble(map1.get("AQI").toString()));
if (Double.parseDouble(map1.get("AQI").toString())>=50){
String name = map1.get("maxSensor").toString();
- dataAvbByMIdAndTime.get(i).put("primary_pollutants",name);
+ dataAvbByMIdAndTime.get(i).put("���������������",name);
}else {
- dataAvbByMIdAndTime.get(i).put("primary_pollutants","-");
+ dataAvbByMIdAndTime.get(i).put("���������������","-");
}
}
}else {
@@ -349,14 +356,14 @@
dataAvbByMIdAndTime.get(i).put("AQI",Double.parseDouble(map1.get("AQI").toString()));
if (Double.parseDouble(map1.get("AQI").toString())>=50){
String name = map1.get("maxSensor").toString();
- dataAvbByMIdAndTime.get(i).put("primary_pollutants",name);
+ dataAvbByMIdAndTime.get(i).put("���������������",name);
}else {
- dataAvbByMIdAndTime.get(i).put("primary_pollutants","-");
+ dataAvbByMIdAndTime.get(i).put("���������������","-");
}
}
}
Map<String, Object> dayAQI = AQICalculation2.dayAQI(dailyAvgData);
- dailyAvgData.put("primary_pollutants",dayAQI.get("maxSensor"));
+ dailyAvgData.put("���������������",dayAQI.get("maxSensor"));
dailyAvgData.put("AQI",dayAQI.get("AQI"));
dataAvbByMIdAndTime.add(dataAvbByMIdAndTime.size(),dailyAvgData);
@@ -366,13 +373,13 @@
if (i!=dataAvbByMIdAndTime.size()-1){
String time = dataAvbByMIdAndTime.get(i).get("time").toString().substring(11,13);
dataAvbByMIdAndTime.get(i).remove("time");
- timeAndDate.put("time",time+"H");
+ timeAndDate.put("time",time);
timeAndDate.put("data",dataAvbByMIdAndTime.get(i));
finalList.add(timeAndDate);
}else {
String time = dataAvbByMIdAndTime.get(i).get("time").toString().substring(0,11);
dataAvbByMIdAndTime.get(i).remove("time");
- timeAndDate.put("time",time+"H");
+ timeAndDate.put("time",time);
timeAndDate.put("data",dataAvbByMIdAndTime.get(i));
finalList.add(timeAndDate);
}
--
Gitblit v1.8.0