From 8beab91730f3e3cd6b53e4d498f763ff9dc65ef5 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:16:55 +0800
Subject: [PATCH] 修改污染溯源接口，从history表中获取改为从history天表获取
---
src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 207 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
index 8d57a40..b9d2711 100644
--- a/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
@@ -1,10 +1,17 @@
package com.moral.service.impl;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import com.moral.entity.MachineActivate;
+import com.moral.mapper.HistoryMapper;
+import com.moral.util.AQICalculation;
+import com.moral.util.AQICalculation2;
+import com.moral.util.DateUtil;
+import io.swagger.models.auth.In;
import org.apache.commons.collections.MapUtils;
import org.springframework.stereotype.Service;
@@ -16,6 +23,7 @@
import com.moral.service.DeviceService;
import com.moral.service.HistoryHourlyService;
import com.moral.service.SensorService;
+import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
@@ -23,6 +31,9 @@
public class HistoryHourlyServiceImpl implements HistoryHourlyService {
@Resource
private HistoryHourlyMapper historyHourlyMapper;
+
+ @Resource
+ private HistoryMapper historyMapper;
@Resource
private DeviceService deviceService;
@@ -57,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) {
@@ -79,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) {
@@ -100,23 +117,23 @@
}
@Override
- public String getTVOCByMac(String mac,String time,String sensor) {
- return historyHourlyMapper.getTVOCByMac(mac,time,sensor);
+ public String getTVOCByMac(String mac, String time, String sensor) {
+ return historyHourlyMapper.getTVOCByMac(mac, time, sensor);
}
@Override
public String getPressureByMac(String mac, String time) {
- return historyHourlyMapper.getPressureByMac(mac,time);
+ return historyHourlyMapper.getPressureByMac(mac, time);
}
@Override
- public Map<String,Object> getDataByMac(String mac, String time) {
- return historyHourlyMapper.getDataByMac(mac,time);
+ public Map<String, Object> getDataByMac(String mac, String time) {
+ return historyHourlyMapper.getDataByMac(mac, time);
}
@Override
public List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception {
- List<Map<String, Object>> resultMap = historyHourlyMapper.getDataByTimeSlot(mac,startTime,endTime);
+ List<Map<String, Object>> resultMap = historyHourlyMapper.getDataByTimeSlot(mac, startTime, endTime);
return resultMap;
}
@@ -127,10 +144,10 @@
String time = param.get("time").toString();
String[] times = time.split("���");
- String time1=times[0].substring(0,8);
- for (int i = 0; i <times.length ; i++) {
- if (i!=0){
- times[i]=time1+""+times[i];
+ String time1 = times[0].substring(0, 8);
+ for (int i = 0; i < times.length; i++) {
+ if (i != 0) {
+ times[i] = time1 + "" + times[i];
}
}
List<List> lists = new ArrayList<List>();
@@ -145,27 +162,52 @@
Date date1 = calendar.getTime();
String date2 = simpleDateFormat.format(date1);
List<Map> list = historyHourlyMapper.getDataByMacAndTime(mac, sensor, perTime, date2);
+ list.remove(0);
+
+ /*������1-2���������������������������������1���������������������������2���������������������1-24���
+ * ���24���������������������������������������������������������������*/
+ /*������������start----------------------------------------------------------------*/
+ if (list.size() == 23) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ //���������������������yyyy-MM-dd HH:mm:ss
+ perTime = perTime + " 00:00:00";
+ Date perTimeDate = sdf.parse(perTime);
+ perTimeDate = DateUtil.rollDay(perTimeDate, 1);
+ Date endTimeDate = DateUtil.rollDay(perTimeDate, 2);
+ //������������������������
+ String startTime = simpleDateFormat.format(perTimeDate);
+ String endTime = simpleDateFormat.format(endTimeDate);
+
+ //������������2020-11-16���������������������������17���0������������������������������������������2020-11-17---2020-11-18
+ List<Map> nextDayList = historyHourlyMapper.getDataByMacAndTime(mac, sensor, startTime, endTime);
+ if (!ObjectUtils.isEmpty(nextDayList)) {
+ perTime = perTime.replaceAll(" 00:00:00", " 24");
+ Map<String, Object> datas = nextDayList.get(0);
+ datas.put("time", perTime);
+ list.add(datas);
+ }
+ }
+ /*������������end----------------------------------------------------------------*/
+
List<Map> newList = new ArrayList<Map>();
- //System.out.println(list);
- for (int i = 0; i < 24; i++) {
- Map map=new HashMap();
+ for (int i = 0; i <= 24; i++) {
+ Map map = new HashMap();
if (i < 10) {
- map.put("time","0"+i);
- map.put(sensor,"");
+ map.put("time", "0" + i);
+ map.put(sensor, "");
newList.add(map);
- }else {
- map.put("time",""+i);
- map.put(sensor,"");
+ } else {
+ map.put("time", "" + i);
+ map.put(sensor, "");
newList.add(map);
}
}
- //System.out.println(newList);
if (list.size() <= 24 && list.size() >= 0) {
- for (int i = 0; i <list.size() ; i++) {
+ for (int i = 0; i < list.size(); i++) {
String timeS = list.get(i).get("time").toString().substring(11, 13);
for (Map map : newList) {
- if (timeS.equals(map.get("time"))){
- map.replace(sensor,"",list.get(i).get(sensor));
+ if (timeS.equals(map.get("time"))) {
+ map.replace(sensor, "", list.get(i).get(sensor));
}
}
}
@@ -173,7 +215,7 @@
lists.add(newList);
}
- for (int i = 0; i < 24; i++) {
+ for (int i = 0; i <= 24; i++) {
Map<String, Object> map = new HashMap<>();
List iList = new ArrayList();
for (List<Map> list : lists) {
@@ -192,20 +234,160 @@
}
}
}
- map.put("value", iList);
+ map.put("values", iList);
map.put("time", i);
perList.add(map);
}
+
} catch (ParseException e) {
e.printStackTrace();
}
- for (int i = 0; i <perList.size() ; i++) {
+ /*for (int i = 0; i <perList.size() ; i++) {
perList.get(i).replace("time",perList.get(i).get("time"),(Integer) perList.get(i).get("time")+1);
+ }*/
+ int j = 0;
+ for (int i = 0; i < perList.size(); i++) {
+ if (!((List) perList.get(i).get("values")).get(0).equals("")) {
+ j = 1;
+ }
+ }
+ if (j == 0) {
+ perList.clear();
}
return perList;
}
@Override
+ public List<Map> getDataAvbByMIdAndTime(String mId, String startTime, String endTime) {
+ List<Device> devicesByMonitorPointId = deviceService.getDevicesByMonitorPointId(Integer.valueOf(mId));
+ List<List> lists = new ArrayList<>();
+ List<List<Map<String, String>>> listArrayList = new ArrayList<>();
+ List<Map<String, Object>> dataAvbByMIdAndTime = historyHourlyMapper.getDataAvbByMIdAndTime(mId, startTime, endTime);
+ List<Map> mapList = new ArrayList<>();
+ for (Map<String, Object> stringStringMap : dataAvbByMIdAndTime) {
+ Map<String, String> map = new HashMap();
+ String s = stringStringMap.get("O3").toString();
+ Object time = stringStringMap.get("time");
+ map.put("O3", s);
+ map.put("time", time.toString());
+ mapList.add(map);
+ }
+ if (mapList.size() >= 8) {
+ List<Map<String, String>> mapList1 = new ArrayList<>();
+ for (int i = 7; i <= mapList.size() - 1; i++) {
+ if (mapList.get(i).get("O3") != null) {
+ List<Integer> numList = new ArrayList();
+ Map<String, String> O3_8 = new HashMap<>();
+ for (int j = i; j <= mapList.size(); j--) {
+ if (j < 0) {
+ break;
+ }
+ numList.add(j);
+ if (numList.size() == 8) {
+ List e15 = new ArrayList();
+ for (int k = 0; k < numList.size(); k++) {
+ String value = mapList.get(Integer.valueOf(numList.get(k))).get("O3").toString();
+ e15.add(value);
+ }
+ double sum = 0;
+ for (Object o : e15) {
+ sum = sum + Double.parseDouble(o.toString());
+ }
+ Double avg1 = sum / e15.size();
+ int timeOfHour = numList.get(0);
+ if (timeOfHour == 23) {
+ timeOfHour = 0;
+ } else {
+ timeOfHour = timeOfHour + 1;
+ }
+ O3_8.put("time", String.valueOf(timeOfHour));
+ O3_8.put("O3-8h", String.valueOf(avg1));
+ mapList1.add(O3_8);
+ } else {
+ continue;
+ }
+ }
+ }
+ listArrayList.add(mapList1);
+ }
+ }
+ Double maxO3 = 0.0;
+ if (listArrayList.size() > 0) {
+ 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")));
+ }
+
+ maxO3 = Collections.max(O3List);
+ for (int i = 0; i < dataAvbByMIdAndTime.size(); i++) {
+ 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());
+ }
+ }
+ }
+ }
+ 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("time", startTime);
+ }
+ if (dataAvbByMIdAndTime.size() > 24) {
+ for (int i = 0; i < dataAvbByMIdAndTime.size() - 1; i++) {
+ Map<String, Object> map = dataAvbByMIdAndTime.get(i);
+ Map<String, Object> map1 = AQICalculation2.hourlyAQI(map);
+ 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("���������������", name);
+ } else {
+ dataAvbByMIdAndTime.get(i).put("���������������", "-");
+ }
+ }
+ } else {
+ for (int i = 0; i < dataAvbByMIdAndTime.size(); i++) {
+ Map<String, Object> map = dataAvbByMIdAndTime.get(i);
+ Map<String, Object> map1 = AQICalculation2.hourlyAQI(map);
+ 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("���������������", name);
+ } else {
+ dataAvbByMIdAndTime.get(i).put("���������������", "-");
+ }
+ }
+ }
+ Map<String, Object> dayAQI = AQICalculation2.dayAQI(dailyAvgData);
+ dailyAvgData.put("���������������", dayAQI.get("maxSensor"));
+ dailyAvgData.put("AQI", dayAQI.get("AQI"));
+ dataAvbByMIdAndTime.add(dataAvbByMIdAndTime.size(), dailyAvgData);
+
+ List<Map> finalList = new ArrayList<>();
+ for (int i = 0; i < dataAvbByMIdAndTime.size(); i++) {
+ Map timeAndDate = new HashMap();
+ 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);
+ 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);
+ timeAndDate.put("data", dataAvbByMIdAndTime.get(i));
+ finalList.add(timeAndDate);
+ }
+ }
+ return finalList;
+ }
+
+ @Override
public Point getDirPoint(Map<String, Object> parameters) throws Exception {
Map<String, Object> pollutionSourceData = getPollutionSourceDataByHour(parameters);
if (MapUtils.isEmpty(pollutionSourceData)) {
--
Gitblit v1.8.0