From dbb8355061b6f60976d410fe475157c6e82f5593 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 15 Jun 2023 16:12:21 +0800
Subject: [PATCH] 添加多站多参接口
---
screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java | 208 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 181 insertions(+), 27 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
index f35ec68..543886e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
@@ -1,13 +1,16 @@
package com.moral.api.service.impl;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.*;
+import com.moral.api.mapper.HistoryMonthlyMapper;
import com.moral.api.pojo.dto.dataDisplay.MonitorPointDataDisplayDTO;
import com.moral.api.pojo.dto.dataDisplay.SensorComparisonDisplayDTO;
import com.moral.api.pojo.form.dataDisplay.MonitorPointDataDisplayForm;
import com.moral.api.pojo.form.dataDisplay.SensorComparisonDisplayForm;
import com.moral.api.service.*;
import com.moral.constant.Constants;
+import com.moral.pojo.AQI;
import com.moral.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -31,6 +34,8 @@
HistoryDailyService historyDailyService;
@Autowired
HistoryHourlyService historyHourlyService;
+ @Autowired
+ HistoryMonthlyMapper historyMonthlyMapper;
@Autowired
HistoryWeeklyService historyWeeklyService;
@Autowired
@@ -76,21 +81,21 @@
macDataMap.put(value, datas.get(0));
});
if (macDataMap.size() != 0)
- dtos = calculateReportData(macDataMap, deviceMap, startTime);
+ dtos = calculateReportData(macDataMap, deviceMap, reportType, startTime);
}
//���������������������������������������������
else if (reportType.equals(Constants.DAILY_REPORT)) {
//������������
Map<String, HistoryDaily> macDataMap = historyDailyService.getHistoryDailyByMacsAndDate(macs, startTime);
if (macDataMap.size() != 0)
- dtos = calculateReportData(macDataMap, deviceMap, startTime);
+ dtos = calculateReportData(macDataMap, deviceMap, reportType, startTime);
}
//���������������������������������������������
else if (reportType.equals(Constants.WEEKLY_REPORT)) {
//������������
Map<String, HistoryWeekly> macDataMap = historyWeeklyService.getHistoryWeeklyByMacsAndDate(macs, startTime);
if (macDataMap.size() != 0)
- dtos = calculateReportData(macDataMap, deviceMap, startTime, endTime);
+ dtos = calculateReportData(macDataMap, deviceMap, reportType, startTime, endTime);
}
//������������������
else if (reportType.equals(Constants.MONTHLY_REPORT)) {
@@ -103,7 +108,7 @@
macDataDailyMap.put(mac, dailyDatas);
});
if (macDataMonthlyMap.size() != 0)
- dtos = calculateReportData(macDataMonthlyMap, deviceMap, startTime);
+ dtos = calculateReportData(macDataMonthlyMap, deviceMap, reportType, startTime);
//������������������
injectComprehensiveIndex(dtos, macDataDailyMap);
}
@@ -173,7 +178,7 @@
dto.setSensorCode(sensor);
timeValueMap.forEach((time, valueJson) -> {
Map<String, Object> listMap = new HashMap<>();
- //������������������������������
+ //���������������������������������������������
if (valueJson == null) {
listMap.put("time", time);
listMap.put("value", "");
@@ -182,7 +187,7 @@
}
Map<String, Object> valueMap = JSON.parseObject(valueJson, Map.class);
Object sensorValueObject = valueMap.get(sensor);
- //������������������������������������������null
+ //���������������������������������������������
if (sensorValueObject == null) {
listMap.put("time", time);
listMap.put("value", "");
@@ -191,6 +196,7 @@
}
//������������������������������������������
if (reportType.equals(Constants.DAILY_REPORT)) {
+ //���������������������N���������������
if (!Constants.NORMAL_FLAG.equals(valueMap.get(sensor + "-Flag"))) {
listMap.put("time", time);
listMap.put("value", "");
@@ -211,6 +217,154 @@
return dtos;
}
+ @Override
+ public List<SensorComparisonDisplayDTO> getSensorComparisonDisplayDataV2(Map<String, Object> params) {
+ //������
+ List<String> sensors = (List<String>) params.get("sensorCodes");
+ /*Date startDate = form.getStartDate();
+ Date endDate = form.getEndDate();*/
+ //������������
+ List<String> times = (List<String>) params.get("times");
+ String startTime = times.get(0);
+ String endTime = times.get(1);
+ String mac = params.get("mac").toString();
+ String reportType = params.get("reportType").toString();
+ Map<String, String> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ //���������������
+ if (reportType.equals(Constants.MONTHLY_REPORT)) {
+ Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_EN);
+ Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_EN);
+ //List<HistoryHourly> hourlies = historyHourlyService.getValueByMacAndTime(mac, startDate, endDate);
+ QueryWrapper<HistoryMonthly> historyMonthlyQueryWrapper = new QueryWrapper<>();
+ historyMonthlyQueryWrapper.eq("mac",mac);
+ historyMonthlyQueryWrapper.between("time",startTime.substring(0,7)+"-01 00:00:00",endTime.substring(0,7)+"-01 00:00:00");
+ List<HistoryMonthly> monthlies = historyMonthlyMapper.selectList(historyMonthlyQueryWrapper);
+ for (HistoryMonthly historyMonthly : monthlies) {
+ Date time = historyMonthly.getTime();
+ String dateStr = DateUtils.dateToDateString(time, "yyyy-MM");
+ String value = historyMonthly.getValue();
+ timeValueMap.put(dateStr, value);
+ }
+ //���������������������
+ Date middleDate = startDate;
+ while (DateUtils.compareDateStr(DateUtils.dateToDateString(endDate,DateUtils.yyyy_MM_EN),DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_EN),DateUtils.yyyy_MM_EN)<=0){
+ if (timeValueMap.get(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_EN)) == null)
+ timeValueMap.put(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_EN), null);
+ middleDate = DateUtils.addMonths(middleDate,1);
+ }
+ }
+ //������������������
+ else if (reportType.equals(Constants.HOURLY_REPORT)) {
+ Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_EN);
+ Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_EN);
+ List<HistoryHourly> hourlies = historyHourlyService.getValueByMacAndTime(mac, startDate, endDate);
+ for (HistoryHourly historyHourly : hourlies) {
+ Date time = historyHourly.getTime();
+ String dateStr = DateUtils.dateToDateString(time, "yyyy-MM-dd HH");
+ String value = historyHourly.getValue();
+ timeValueMap.put(dateStr, value);
+ }
+ //���������������������
+ Date middleDate = startDate;
+ while (DateUtils.compareDateStr(DateUtils.dateToDateString(endDate,DateUtils.yyyy_MM_dd_HH_EN),DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN),DateUtils.yyyy_MM_dd_HH_EN)<=0){
+ if (timeValueMap.get(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN)) == null)
+ timeValueMap.put(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN), null);
+ middleDate = DateUtils.addHours(middleDate,1);
+ }
+ }
+ //���������������
+ else if (reportType.equals(Constants.DAILY_REPORT)) {
+ Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_EN);
+ Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_EN);
+ List<HistoryDaily> dailies = historyDailyService.getHistoryDailyByMacAndTimeSlot(mac, startDate, endDate);
+ for (HistoryDaily historyDaily : dailies) {
+ Date time = historyDaily.getTime();
+ String dateStr = DateUtils.dateToDateString(time, "yyyy-MM-dd");
+ String value = historyDaily.getValue();
+ timeValueMap.put(String.valueOf(dateStr), value);
+ }
+ //���������������������
+ Date middleDate = startDate;
+ while (DateUtils.compareDateStr(DateUtils.dateToDateString(endDate,DateUtils.yyyy_MM_dd_EN),DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_EN),DateUtils.yyyy_MM_dd_EN)<=0){
+ if (timeValueMap.get(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_EN)) == null)
+ timeValueMap.put(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_EN), null);
+ middleDate = DateUtils.addDays(middleDate,1);
+ }
+ } else
+ return null;
+ //������������
+ //timeValueMap = sortMapByTime(timeValueMap, reportType);
+ //������������������
+ List<SensorComparisonDisplayDTO> dtos = new ArrayList<>();
+ for (String sensor : sensors) {
+ SensorComparisonDisplayDTO dto = new SensorComparisonDisplayDTO();
+ List<Map<String, Object>> dtoTimeValueList = new ArrayList<>();
+ if(sensor.equals("a00e12") || sensor.equals("a00e03")){
+ dto.setCode("1");
+ }else if (sensor.equals("a01006")){
+ dto.setCode("2");
+ }else if (sensor.equals("a99054") || sensor.equals("a21005")){
+ dto.setCode("3");
+ }else {
+ dto.setCode("0");
+ }
+ dto.setSensorCode(sensor);
+ timeValueMap.forEach((time, valueJson) -> {
+ Map<String, Object> listMap = new HashMap<>();
+ //���������������������������������������������
+ if (valueJson == null) {
+ listMap.put("time", time);
+ listMap.put("value", "");
+ dtoTimeValueList.add(listMap);
+ return;
+ }
+ Map<String, Object> valueMap = JSON.parseObject(valueJson, Map.class);
+ Object sensorValueObject = valueMap.get(sensor);
+ //���������������������������������������������
+ if (sensorValueObject == null) {
+ listMap.put("time", time);
+ listMap.put("value", "");
+ dtoTimeValueList.add(listMap);
+ return;
+ }
+ //������������������������������������������
+ if (reportType.equals(Constants.HOURLY_REPORT)) {
+ //���������������������N���������������
+ if (!Constants.NORMAL_FLAG.equals(valueMap.get(sensor + "-Flag"))) {
+ listMap.put("time", time);
+ listMap.put("value", "");
+ dtoTimeValueList.add(listMap);
+ return;
+ }
+ }
+ //������������
+ Double sensorValue = Double.parseDouble(sensorValueObject.toString());
+ //������������
+ listMap.put("time", time);
+ listMap.put("value", sensorValue);
+ dtoTimeValueList.add(listMap);
+ });
+ Collections.sort(dtoTimeValueList, new Comparator<Map<String, Object>>() {
+ public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+ String id1 = (String) o1.get("time");
+ String id2 = (String) o2.get("time");
+ return id1.compareTo(id2);
+ }
+
+ });
+ dto.setTimeValueList(dtoTimeValueList);
+ dtos.add(dto);
+ }
+ return dtos;
+ }
+
+ /**
+ * @Description: ������������������������
+ * @Param: [timeValueMap, reportType]
+ * @return: java.util.Map<java.lang.String , java.lang.String>
+ * @Author: ���������
+ * @Date: 2021/11/3
+ */
private Map<String, String> sortMapByTime(Map<String, String> timeValueMap, String reportType) {
List<Map.Entry<String, String>> entries = new ArrayList(timeValueMap.entrySet());
Collections.sort(entries, new Comparator<Map.Entry<String, String>>() {
@@ -258,7 +412,6 @@
String endTime = DateUtils.dateToDateString(endDate, "yyyy-MM-dd");
String time = startTime + " - " + endTime;
//������������������
- Double AQINum = 0d;
Double PM25Num = 0d;
Double PM10Num = 0d;
Double SO2Num = 0d;
@@ -266,8 +419,7 @@
Double CONum = 0d;
Double O3Num = 0d;
Double TVOCNum = 0d;
- //������AQI,PM2.5,PM10,SO2,NO2,CO,O3,TVOC���������
- Double AQISum = 0d;
+ //������PM2.5,PM10,SO2,NO2,CO,O3,TVOC���������
Double PM25Sum = 0d;
Double PM10Sum = 0d;
Double SO2Sum = 0d;
@@ -313,18 +465,6 @@
TVOCSum = MathUtils.add(TVOCSum, Double.valueOf(TVOC.toString()));
TVOCNum++;
}
- //���AQI
- int aqi = AQIUtils.hourlyAqi(valueMap);
- if (aqi != 0) {
- AQISum += Double.valueOf(aqi);
- AQINum++;
- }
- }
- //������aqi������
- if (AQINum != 0d) {
- Double AQID = AmendUtils.sciCal(AQISum / AQINum, 0);
- int AQIAvg = new Double(AQID).intValue();
- dto.setAQI(AQIAvg);
}
//������PM2.5������
if (PM25Num != 0d) {
@@ -366,6 +506,16 @@
Double TVOCAvg = AmendUtils.sciCal(TVOCSum / TVOCNum, 2);
dto.setA99054(TVOCAvg);
}
+ //������AQI
+ Map<String,Object> sixParamMap = new HashMap<>();
+ sixParamMap.put("a05024",dto.getA05024());
+ sixParamMap.put("a21004",dto.getA21004());
+ sixParamMap.put("a21005",dto.getA21005());
+ sixParamMap.put("a34002",dto.getA34002());
+ sixParamMap.put("a34004",dto.getA34004());
+ sixParamMap.put("a21026",dto.getA21026());
+ AQI aqi = AQIUtils.dailyAQI(sixParamMap);
+ dto.setAQI(aqi.getAQIValue());
dto.setDeviceName(deviceName);
dto.setTime(time);
dtos.add(dto);
@@ -381,7 +531,7 @@
* @Author: ���������
* @Date: 2021/9/28
*/
- private <T> List<MonitorPointDataDisplayDTO> calculateReportData(Map<String, T> macDataMap, Map<String, Device> deviceMap, Date... date) {
+ private <T> List<MonitorPointDataDisplayDTO> calculateReportData(Map<String, T> macDataMap, Map<String, Device> deviceMap, String reportType, Date... date) {
List<MonitorPointDataDisplayDTO> dtos = new ArrayList<>();
macDataMap.forEach((key, valueObject) -> {
MonitorPointDataDisplayDTO dto = new MonitorPointDataDisplayDTO();
@@ -409,7 +559,7 @@
startTime = DateUtils.dateToDateString(date[0], "yyyy-MM");
dto.setTime(startTime);
//������������
- injectDataToDto(valueMap, false, dto);
+ injectDataToDto(valueMap, false, dto, reportType);
dtos.add(dto);
});
return dtos;
@@ -423,7 +573,7 @@
* @Author: ���������
* @Date: 2021/9/28
*/
- private void injectDataToDto(Map<String, Object> valueMap, boolean flag, MonitorPointDataDisplayDTO dto) {
+ private void injectDataToDto(Map<String, Object> valueMap, boolean flag, MonitorPointDataDisplayDTO dto, String reportType) {
//������CO
String COFlag = (String) valueMap.get("a21005-Flag");
Object COObject = valueMap.get("a21005");
@@ -474,9 +624,13 @@
dto.setA05024(new Double(AmendUtils.sciCal(O3, 0)).intValue());
}
//������AQI
- int aqi = AQIUtils.hourlyAqi(valueMap);
- if (aqi != 0)
- dto.setAQI(aqi);
+ Integer aqi;
+ if (reportType.equals(Constants.HOURLY_REPORT)) {
+ aqi = AQIUtils.hourlyAQI(valueMap).getAQIValue();
+ } else {
+ aqi = AQIUtils.dailyAQI(valueMap).getAQIValue();
+ }
+ dto.setAQI(aqi);
}
--
Gitblit v1.8.0