From adde1ed1a99622c80a95dea83e294711d295c55c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 08 Sep 2020 14:46:43 +0800
Subject: [PATCH] 微型站5分钟与半小时数据
---
src/main/java/com/moral/service/impl/HistoryServiceImpl.java | 120 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 78 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
index 53fa49d..f46c6ea 100644
--- a/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -34,8 +34,8 @@
import com.moral.service.HistoryService;
import com.moral.service.ProfessionService;
import com.moral.util.AQICalculation;
-
import com.moral.util.DatesUtil;
+
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -383,7 +383,8 @@
}
returnMap = AQICalculation.hourlyAQI(AQIMap);
}
-
+ long aqi = Math.round(Double.valueOf(returnMap.get("AQI").toString()));
+ returnMap.put("AQI",aqi);
return returnMap;
}
@@ -520,7 +521,9 @@
for (Map.Entry<String, Object> entry : map.entrySet()) {
for (Sensor sensor : sensors) {
if (sensor.getSensorKey().equals(entry.getKey())) {
- mapAvg.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ if (entry.getValue() != null) {
+ mapAvg.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ }
} else if (("min" + sensor.getSensorKey()).equals(entry.getKey())) {
mapMin.put(entry.getKey().substring(3), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString());
} else if (("max" + sensor.getSensorKey()).equals(entry.getKey())) {
@@ -543,10 +546,36 @@
}
@Override
- public List<Map<String,Object>> getO3AVG(Map<String, Object> parameters) {
- String mac= (String) parameters.get("mac");
- String stime= (String) parameters.get("time");
- SimpleDateFormat format=new SimpleDateFormat("yyyy-MM");
+ public List<Map<String, Object>> getUavSensorData(Map<String, Object> parameters) {
+ List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);
+ List<String> sensorKeys = new ArrayList<>();
+ for (Sensor sensor : sensors) {
+ sensorKeys.add(sensor.getSensorKey());
+ }
+ parameters.put("sensorKeys", sensorKeys);
+ List<Map<String, Object>> uavSensorData = historyMapper.getUavSensorData(parameters);
+ for (Map<String, Object> dataMap : uavSensorData) {
+ for (Map.Entry<String, Object> entry : dataMap.entrySet()) {
+ for (Sensor sensor : sensors) {
+ if (sensor.getSensorKey().equals(entry.getKey())) {
+ if (entry.getValue() != null) {
+ dataMap.put(entry.getKey(), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ }
+ }
+ }
+ }
+ }
+ Map<String, Object> map = sensorMapper.getSensorBySensorKey(parameters.get("sensorKey").toString());
+ parameters.put("unit", map.get("unit"));
+ parameters.put("description", map.get("description"));
+ return uavSensorData;
+ }
+
+ @Override
+ public List<Map<String, Object>> getO3AVG(Map<String, Object> parameters) {
+ String mac = (String) parameters.get("mac");
+ String stime = (String) parameters.get("time");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
Date time = null;
try {
time = format.parse(stime);
@@ -554,7 +583,7 @@
e.printStackTrace();
}
List<String> stringListDate = DatesUtil.getAllTheDateOftheMonth(time);
- List<Map<String,Object>> maxList=new ArrayList<Map<String,Object>>();
+ List<Map<String, Object>> maxList = new ArrayList<Map<String, Object>>();
for (String date : stringListDate) {
Map<String, Object> parm = new HashMap<String, Object>();
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -566,55 +595,62 @@
parm.put("nextDate", nextDate);
parm.put("mac", mac);
List<Map<String, Object>> listMap = historyMapper.getO3AVG(parm);
- List list=new ArrayList();
- DatesUtil.getList(listMap,list);
- List list1=new ArrayList();
- String maxO3="";
- for (int i = 0; i <list.size() ; i++) {
- List elist=new ArrayList();
- Double sum=0.0;
- Double avg=0.0;
- for (Object o : (List)list.get(i)) {
- Iterator<Map.Entry> iterator= ((Map)o).entrySet().iterator();
- while(iterator.hasNext()) {
+ List list = new ArrayList();
+ DatesUtil.getList(listMap, list);
+ List list1 = new ArrayList();
+ String maxO3 = "";
+ for (int i = 0; i < list.size(); i++) {
+ List elist = new ArrayList();
+ Double sum = 0.0;
+ Double avg = 0.0;
+ for (Object o : (List) list.get(i)) {
+ Iterator<Map.Entry> iterator = ((Map) o).entrySet().iterator();
+ while (iterator.hasNext()) {
Map.Entry entry = iterator.next();
- if (entry.getKey().equals("e15")){
+ if (entry.getKey().equals("e15")) {
elist.add(entry.getValue());
}
}
}
- for (int j = 0; j <elist.size(); j++) {
- sum+=Double.parseDouble((String) elist.get(j));
- if (listMap.size()<=8 && listMap.size()>0){
- avg=sum/listMap.size();
- }else {
- avg=sum/8;
+ for (int j = 0; j < elist.size(); j++) {
+ sum += Double.parseDouble((String) elist.get(j));
+ if (listMap.size() <= 8 && listMap.size() > 0) {
+ avg = sum / listMap.size();
+ } else {
+ avg = sum / 8;
}
}
- if (avg==0.0){
+ if (avg == 0.0) {
list1.add("");
- }else {
+ } else {
BigDecimal b = new BigDecimal(avg);
- double avg1 = b.setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue();
+ double avg1 = b.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
list1.add(avg1);
}
}
- String timef=date+" 00:00:00";
- String timea=date+" 23:59:59";
- int num=historyMapper.getNum(timef,timea);
- if (num==0) {
+ String timef = date + " 00:00:00";
+ String timea = date + " 23:59:59";
+ int num = historyMapper.getNum(timef, timea);
+ if (num == 0) {
maxO3 = "";
- }else {
- if (list1.size()!=0){
- maxO3= ""+ Collections.max(list1);
- }else {
- maxO3="";
- }}
- Map<String,Object> avgMap=new HashMap<String,Object>();
- avgMap.put("time",date);
- avgMap.put("e15",maxO3);
+ } else {
+ if (list1.size() != 0) {
+ maxO3 = "" + Collections.max(list1);
+ } else {
+ maxO3 = "";
+ }
+ }
+ Map<String, Object> avgMap = new HashMap<String, Object>();
+ avgMap.put("time", date);
+ avgMap.put("e15", maxO3);
maxList.add(avgMap);
}
return maxList;
}
+
+ @Override
+ public String getJsonData(String mac, String time,String table) {
+ return historyMapper.getJsonData(mac,time,table);
+ }
+
}
--
Gitblit v1.8.0