From 1dd4896fa2ea4d7948b9564ae5c8cbd55a3f3abe Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 06 Sep 2023 14:44:06 +0800
Subject: [PATCH] fix:job补偿修复
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 27 ++++++++
screen-api/src/main/java/com/moral/api/dto/MonitoringStationDTOResult.java | 49 ++++++++++++++++
screen-job/src/main/java/com/moral/api/controller/PubController.java | 4
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 67 ++++++++++++++--------
screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java | 2
5 files changed, 121 insertions(+), 28 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
index 8c17ad1..a2e6b2a 100644
--- a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -1,6 +1,7 @@
package com.moral.api.controller;
import com.moral.api.dto.MonitoringStationDTO;
+import com.moral.api.dto.MonitoringStationDTOResult;
import com.moral.api.entity.MonitorPoint;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
import com.moral.api.pojo.vo.monitorPoint.MonitorPointsVO;
@@ -20,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -211,6 +213,29 @@
@RequestParam @ApiParam(value = "reportType",name = "type") int reportType,
@RequestParam @ApiParam(value = "endTime",name = "������������") String endTime*/
List<MonitoringStationDTO> resList = monitorPointService.listMonitoringStationDTO(params,Integer.parseInt(params.get("reportType").toString()),params.get("startTime").toString(),params.get("endTime").toString());
- return ResultMessage.ok(resList);
+ List<MonitoringStationDTOResult> list = new ArrayList<>();
+ for(MonitoringStationDTO m : resList){
+ MonitoringStationDTOResult result = new MonitoringStationDTOResult();
+ result.setName(m.getName());
+ result.setMac(m.getMac());
+ result.setPM25(m.getPM25().compareTo(BigDecimal.ZERO)==0?"-":m.getPM25().toString());
+ result.setPM25Num(m.getPM25Num()==0?"-":String.valueOf(m.getPM25Num()));
+ result.setO3(m.getO3().compareTo(BigDecimal.ZERO)==0?"-":m.getO3().toString());
+ result.setO3Num(m.getO3Num()==0?"-":String.valueOf(m.getO3Num()));
+ result.setTovc(m.getTovc().compareTo(BigDecimal.ZERO)==0?"-":m.getTovc().toString());
+ result.setTOVCNum(m.getTOVCNum()==0?"-":String.valueOf(m.getTOVCNum()));
+ result.setComposite(m.getComposite().compareTo(BigDecimal.ZERO)==0?"-":m.getComposite().toString());
+ result.setCompositeNum(m.getCompositeNum()==0?"-":String.valueOf(m.getCompositeNum()));
+ result.setSO2(m.getSO2().compareTo(BigDecimal.ZERO)==0?"-":m.getSO2().toString());
+ result.setSO2Num(m.getSO2Num()==0?"-":String.valueOf(m.getSO2Num()));
+ result.setNO2(m.getNO2().compareTo(BigDecimal.ZERO)==0?"-":m.getNO2().toString());
+ result.setNO2Num(m.getNO2Num()==0?"-":String.valueOf(m.getNO2Num()));
+ result.setPM10(m.getPM10().compareTo(BigDecimal.ZERO)==0?"-":m.getPM10().toString());
+ result.setPM10Num(m.getPM10Num()==0?"-":String.valueOf(m.getPM10Num()));
+ result.setCO(m.getCO().compareTo(BigDecimal.ZERO)==0?"-":m.getCO().toString());
+ result.setCONum(m.getCONum()==0?"-":String.valueOf(m.getCONum()));
+ list.add(result);
+ }
+ return ResultMessage.ok(list);
}
}
diff --git a/screen-api/src/main/java/com/moral/api/dto/MonitoringStationDTOResult.java b/screen-api/src/main/java/com/moral/api/dto/MonitoringStationDTOResult.java
new file mode 100644
index 0000000..ba17343
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/dto/MonitoringStationDTOResult.java
@@ -0,0 +1,49 @@
+package com.moral.api.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName monitoringStationDTO
+ * @Description TODO
+ * @Author @lizijie
+ * @Date 2023-08-18 8:24
+ * @Version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class MonitoringStationDTOResult {
+
+ private String name;
+
+ private String mac;
+
+ private String PM25;
+
+ private String PM25Num;
+
+ private String O3;
+
+ private String O3Num;
+ private String Tovc;
+
+ private String TOVCNum;
+
+ private String Composite;
+
+ private String CompositeNum;
+
+ private String SO2;
+ private String SO2Num;
+
+ private String NO2;
+ private String NO2Num;
+
+ private String PM10;
+ private String PM10Num;
+
+ private String CO;
+ private String CONum;
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index b5e058d..b16ba1d 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -567,6 +567,7 @@
resultMap.put(h.getMac(),maps);
}
for(Map.Entry entry : resultMap.entrySet()){
+ boolean dimension = false;
String mapKey = (String) entry.getKey();
Map<String,ArrayList<Double>> mapValue = (Map<String,ArrayList<Double>>)entry.getValue();
Map<String, Object> data = new HashMap<>();
@@ -576,6 +577,7 @@
data.put("PM2_5",rsAvg);
}else {
data.put("PM2_5",0);
+ dimension = true;
}
if(mapValue.containsKey("PM10")){
Double ListAvg = mapValue.get("PM10").stream().collect(Collectors.averagingDouble(Double::doubleValue));
@@ -583,6 +585,7 @@
data.put("PM10",rsAvg);
}else {
data.put("PM10",0);
+ dimension = true;
}
if(mapValue.containsKey("SO2")){
Double ListAvg = mapValue.get("SO2").stream().collect(Collectors.averagingDouble(Double::doubleValue));
@@ -590,6 +593,7 @@
data.put("SO2",rsAvg);
}else {
data.put("SO2",0);
+ dimension = true;
}
if(mapValue.containsKey("NO2")){
Double ListAvg = mapValue.get("NO2").stream().collect(Collectors.averagingDouble(Double::doubleValue));
@@ -597,6 +601,7 @@
data.put("NO2",rsAvg);
}else {
data.put("NO2",0);
+ dimension = true;
}
if(mapValue.containsKey("CO")){
Double ListAvg = percentile(mapValue.get("CO"),95d);
@@ -604,6 +609,7 @@
data.put("CO",rsAvg);
}else {
data.put("CO",0);
+ dimension = true;
}
if(mapValue.containsKey("O3")){
Double ListAvg = percentile(mapValue.get("O3"),90d);
@@ -611,6 +617,7 @@
data.put("O3",rsAvg);
}else {
data.put("O3",0);
+ dimension = true;
}
if(mapValue.containsKey("TVOC")){
Double ListAvg = mapValue.get("TVOC").stream().collect(Collectors.averagingDouble(Double::doubleValue));
@@ -618,8 +625,12 @@
data.put("TVOC",rsAvg);
}else {
data.put("TVOC",0);
+ dimension = true;
}
Double resultNum = ComprehensiveIndexUtils.dailyData(data);
+ if(dimension){
+ resultNum = 0d;
+ }
MonitoringStationDTO monitoringStationDTO = new MonitoringStationDTO();
monitoringStationDTO.setPM25(BigDecimal.valueOf(Double.parseDouble(data.get("PM2_5").toString())));
monitoringStationDTO.setO3(BigDecimal.valueOf(Double.parseDouble(data.get("O3").toString())));
@@ -632,6 +643,7 @@
monitoringStationDTO.setMac(mapKey);
list.add(monitoringStationDTO);
}
+ List<MonitoringStationDTO> compositeListResult = fun3(list,0);
List<MonitoringStationDTO> compositeList = fun3(list,1);
List<MonitoringStationDTO> pM25List = fun3(list,2);
List<MonitoringStationDTO> o3List = fun3(list,3);
@@ -646,34 +658,35 @@
Map<String,String> deviceMap = new HashMap<>();
wrapper.list().forEach(it->deviceMap.put(it.getMac(),it.getName()));
- for (MonitoringStationDTO m :compositeList ){
+ for (MonitoringStationDTO m :compositeListResult ){
MonitoringStationDTO monit = new MonitoringStationDTO();
String mac = m.getMac();
monit.setMac(mac);
monit.setName(deviceMap.get(mac));
- monit.setComposite(m.getComposite());
- monit.setCompositeNum(m.getCompositeNum());
+ List<String> listComposite = compositeList.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
+ monit.setComposite(listComposite.indexOf(mac) == -1?BigDecimal.ZERO:compositeList.get(listComposite.indexOf(mac)).getComposite());
+ monit.setCompositeNum(listComposite.indexOf(mac) == -1?0:compositeList.get(listComposite.indexOf(mac)).getCompositeNum());
List<String> listPM25 = pM25List.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
List<String> listO3 = o3List.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
List<String> listTovc = tovcList.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
- monit.setO3(o3List.get(listO3.indexOf(mac)).getO3());
- monit.setO3Num(o3List.get(listO3.indexOf(mac)).getO3Num());
- monit.setPM25(pM25List.get(listPM25.indexOf(mac)).getPM25());
- monit.setPM25Num(pM25List.get(listPM25.indexOf(mac)).getPM25Num());
- monit.setTovc(tovcList.get(listTovc.indexOf(mac)).getTovc());
- monit.setTOVCNum(tovcList.get(listTovc.indexOf(mac)).getTOVCNum());
+ monit.setO3(listO3.indexOf(mac) == -1?BigDecimal.ZERO:o3List.get(listO3.indexOf(mac)).getO3());
+ monit.setO3Num(listO3.indexOf(mac) == -1?0:o3List.get(listO3.indexOf(mac)).getO3Num());
+ monit.setPM25(listPM25.indexOf(mac) == -1?BigDecimal.ZERO:pM25List.get(listPM25.indexOf(mac)).getPM25());
+ monit.setPM25Num(listPM25.indexOf(mac) == -1?0:pM25List.get(listPM25.indexOf(mac)).getPM25Num());
+ monit.setTovc(listTovc.indexOf(mac) == -1?BigDecimal.ZERO:tovcList.get(listTovc.indexOf(mac)).getTovc());
+ monit.setTOVCNum(listTovc.indexOf(mac) == -1?0:tovcList.get(listTovc.indexOf(mac)).getTOVCNum());
List<String> listSO2 = SO2List.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
- monit.setSO2(SO2List.get(listSO2.indexOf(mac)).getSO2());
- monit.setSO2Num(SO2List.get(listSO2.indexOf(mac)).getSO2Num());
+ monit.setSO2(listSO2.indexOf(mac) == -1?BigDecimal.ZERO:SO2List.get(listSO2.indexOf(mac)).getSO2());
+ monit.setSO2Num(listSO2.indexOf(mac) == -1?0:SO2List.get(listSO2.indexOf(mac)).getSO2Num());
List<String> listNO2 = NO2cList.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
- monit.setNO2(NO2cList.get(listNO2.indexOf(mac)).getNO2());
- monit.setNO2Num(NO2cList.get(listNO2.indexOf(mac)).getNO2Num());
+ monit.setNO2(listNO2.indexOf(mac) == -1?BigDecimal.ZERO:NO2cList.get(listNO2.indexOf(mac)).getNO2());
+ monit.setNO2Num(listNO2.indexOf(mac) == -1?0:NO2cList.get(listNO2.indexOf(mac)).getNO2Num());
List<String> listPM10 = PM10List.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
- monit.setPM10(PM10List.get(listPM10.indexOf(mac)).getPM10());
- monit.setPM10Num(PM10List.get(listPM10.indexOf(mac)).getPM10Num());
+ monit.setPM10(listPM10.indexOf(mac) == -1?BigDecimal.ZERO:PM10List.get(listPM10.indexOf(mac)).getPM10());
+ monit.setPM10Num(listPM10.indexOf(mac) == -1?0:PM10List.get(listPM10.indexOf(mac)).getPM10Num());
List<String> listCO = COList.stream().map(MonitoringStationDTO::getMac).collect(Collectors.toList());
- monit.setCO(COList.get(listCO.indexOf(mac)).getCO());
- monit.setCONum(COList.get(listCO.indexOf(mac)).getCONum());
+ monit.setCO(listCO.indexOf(mac) == -1?BigDecimal.ZERO:COList.get(listCO.indexOf(mac)).getCO());
+ monit.setCONum(listCO.indexOf(mac) == -1?0:COList.get(listCO.indexOf(mac)).getCONum());
resultList.add(monit);
}
@@ -685,28 +698,31 @@
List<MonitoringStationDTO> compositeList = new ArrayList<>();
Map<BigDecimal,List<MonitoringStationDTO>> map1 = new HashMap<>();
if(type == 1){
+ compositeList = monList.stream().filter(it->it.getComposite().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getComposite)).collect(Collectors.toList());
+ map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getComposite,LinkedHashMap::new,Collectors.toList()));
+ }else if(type == 0){
compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getComposite)).collect(Collectors.toList());
map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getComposite,LinkedHashMap::new,Collectors.toList()));
}else if(type == 2){
- compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getPM25)).collect(Collectors.toList());
+ compositeList = monList.stream().filter(it->it.getPM25().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getPM25)).collect(Collectors.toList());
map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getPM25,LinkedHashMap::new,Collectors.toList()));
}else if(type == 3){
- compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getO3)).collect(Collectors.toList());
+ compositeList = monList.stream().filter(it->it.getO3().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getO3)).collect(Collectors.toList());
map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getO3,LinkedHashMap::new,Collectors.toList()));
}else if(type == 4){
- compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getTovc)).collect(Collectors.toList());
+ compositeList = monList.stream().filter(it->it.getTovc().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getTovc)).collect(Collectors.toList());
map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getTovc,LinkedHashMap::new,Collectors.toList()));
}else if(type == 5){
- compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getSO2)).collect(Collectors.toList());
+ compositeList = monList.stream().filter(it->it.getSO2().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getSO2)).collect(Collectors.toList());
map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getSO2,LinkedHashMap::new,Collectors.toList()));
}else if(type == 6){
- compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getNO2)).collect(Collectors.toList());
+ compositeList = monList.stream().filter(it->it.getNO2().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getNO2)).collect(Collectors.toList());
map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getNO2,LinkedHashMap::new,Collectors.toList()));
}else if(type == 7){
- compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getPM10)).collect(Collectors.toList());
+ compositeList = monList.stream().filter(it->it.getPM10().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getPM10)).collect(Collectors.toList());
map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getPM10,LinkedHashMap::new,Collectors.toList()));
}else if(type == 8){
- compositeList = monList.stream().sorted(Comparator.comparing(MonitoringStationDTO::getCO)).collect(Collectors.toList());
+ compositeList = monList.stream().filter(it->it.getCO().compareTo(BigDecimal.ZERO)!=0).sorted(Comparator.comparing(MonitoringStationDTO::getCO)).collect(Collectors.toList());
map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getCO,LinkedHashMap::new,Collectors.toList()));
}
int index = 1;
@@ -718,6 +734,9 @@
if(type == 1){
stationDTO.setComposite(m.getComposite());
stationDTO.setCompositeNum(index);
+ }else if(type == 0){
+ stationDTO.setComposite(m.getComposite());
+ stationDTO.setCompositeNum(index);
}else if(type == 2){
stationDTO.setPM25(m.getPM25());
stationDTO.setPM25Num(index);
diff --git a/screen-job/src/main/java/com/moral/api/controller/PubController.java b/screen-job/src/main/java/com/moral/api/controller/PubController.java
index 3a54e5b..0af44fe 100644
--- a/screen-job/src/main/java/com/moral/api/controller/PubController.java
+++ b/screen-job/src/main/java/com/moral/api/controller/PubController.java
@@ -70,8 +70,8 @@
@GetMapping("insertHistoryAqi")
@ApiOperation(value = "������������������", notes = "������������������")
- public ResultMessage insertHistoryAqi() {
- historyAqiService.insertHistoryAqi();
+ public ResultMessage insertHistoryAqi(String time) {
+ historyAqiService.insertHistoryAqi(time);
return new ResultMessage();
}
diff --git a/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java b/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
index b327a2d..d07822d 100644
--- a/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java
@@ -39,7 +39,7 @@
@XxlJob("insertHistoryAqi")
public ReturnT insertHistoryAqi() {
try {
- historyAqiService.insertHistoryAqi();
+ historyAqiService.insertHistoryAqi(null);
} catch (Exception e) {
XxlJobHelper.log(e.getMessage());
return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
--
Gitblit v1.8.0