From a901d8910243b6c15c3ff7722d006e06d87ec6f6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Aug 2023 15:58:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 225 +++++++++++++-------------------------------------------
1 files changed, 53 insertions(+), 172 deletions(-)
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 3477da0..b5e058d 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
@@ -78,18 +78,19 @@
// region = RegionCodeUtils.regionCodeConvertToName(regionCode);
// }
- //���������������
+ /* //���������������
List<Organization> childrenOrganization = organizationService.getChildrenOrganizationsById(organizationId);
- List<Integer> organizationIds = new ArrayList<>();
+
for (Organization organization : childrenOrganization) {
organizationIds.add(organization.getId());
}
- organizationIds.add(organizationId);
+ organizationIds.add(organizationId);*/
//������������
QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();
//������region������������������������������������������������������������������������������
//������region���������������������������������������������������������
+ List<Integer> organizationIds = deviceMapper.deviceOrgIdList(organizationId);
if (region != null){
queryMonitorPointsWrapper.eq(region, regionCode);
}
@@ -481,166 +482,6 @@
}
return resultList;
}
-
-
- @Override
- public List<MonitoringStationDTO> listMonitoringStationDTO(Map<String, Object> params, int reportType, String startTime, String endTime) {
- // List<String> macs = Arrays.asList(mac.split(","));
- List<String> macs = (List<String>) params.remove("mac");
- Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_EN);
- Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_EN);
- List<HistoryDaily> historyDailyByMacAndTimeSlot = historyDailyService.getHistoryDailyByMacAndTimeSlot(macs, startDate, endDate);
-
- return resultList(historyDailyByMacAndTimeSlot);
- }
-
-
- private List<MonitoringStationDTO> resultList(List<HistoryDaily> historyDailyByMacAndTimeSlot){
- List<MonitoringStationDTO> list = new ArrayList<>();
- if(CollectionUtils.isEmpty(historyDailyByMacAndTimeSlot)){
- return list;
- }
- Map<String,Map<String,ArrayList<Double>>> resultMap = new HashMap<>();
- int zz = 0;
- for(HistoryDaily h : historyDailyByMacAndTimeSlot) {
- JSONObject jsonObject = JSONObject.parseObject(h.getValue());
- Map<String, Object> map = jsonObject.getInnerMap();
- Map<String,ArrayList<Double>> maps = Objects.nonNull(resultMap.get(h.getMac()))?resultMap.get(h.getMac()):new HashMap<>();
- if(Objects.nonNull(map.get("a34004"))){
- ArrayList<Double> numResult = Objects.nonNull(maps.get("PM2_5"))?maps.get("PM2_5"):new ArrayList<>();
- numResult.add(Double.parseDouble(map.get("a34004").toString()));
- maps.put("PM2_5",numResult);
- }
- if(Objects.nonNull(map.get("a05024"))){
- ArrayList<Double> numResult = Objects.nonNull(maps.get("O3"))?maps.get("O3"):new ArrayList<>();
- numResult.add(Double.parseDouble(map.get("a05024").toString()));
- maps.put("O3",numResult);
- }
- if(Objects.nonNull(map.get("a34002"))){
- ArrayList<Double> numResult = Objects.nonNull(maps.get("PM10"))?maps.get("PM10"):new ArrayList<>();
- numResult.add(Double.parseDouble(map.get("a34002").toString()));
- maps.put("PM10",numResult);
- }
- if(Objects.nonNull(map.get("a21026"))){
- ArrayList<Double> numResult = Objects.nonNull(maps.get("SO2"))?maps.get("SO2"):new ArrayList<>();
- numResult.add(Double.parseDouble(map.get("a21026").toString()));
- maps.put("SO2",numResult);
- }
- if(Objects.nonNull(map.get("a21004"))){
- ArrayList<Double> numResult = Objects.nonNull(maps.get("NO2"))?maps.get("NO2"):new ArrayList<>();
- numResult.add(Double.parseDouble(map.get("a21004").toString()));
- maps.put("NO2",numResult);
- }
- if(Objects.nonNull(map.get("a21005"))){
- System.out.println(">>>"+map.toString());
- System.out.println(">>>"+map.get("a21005").toString());
- ArrayList<Double> numResult = Objects.nonNull(maps.get("CO"))?maps.get("CO"):new ArrayList<>();
- numResult.add(Double.parseDouble(map.get("a21005").toString()));
- maps.put("CO",numResult);
- }
- if(Objects.nonNull(map.get("a99054"))){
- ArrayList<Double> numResult = Objects.nonNull(maps.get("TVOC"))?maps.get("TVOC"):new ArrayList<>();
- numResult.add(Double.parseDouble(map.get("a99054").toString()));
- maps.put("TVOC",numResult);
- }
- resultMap.put(h.getMac(),maps);
- zz++;
- }
- for(Map.Entry entry : resultMap.entrySet()){
- String mapKey = (String) entry.getKey();
- Map<String,ArrayList<Double>> mapValue = (Map<String,ArrayList<Double>>)entry.getValue();
- Map<String, Object> data = new HashMap<>();
- if(mapValue.containsKey("PM2_5")){
- Double ListAvg = mapValue.get("PM2_5").stream().collect(Collectors.averagingDouble(Double::doubleValue));
- double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
- data.put("PM2_5",rsAvg);
- }else {
- data.put("PM2_5",0);
- }
- if(mapValue.containsKey("PM10")){
- Double ListAvg = mapValue.get("PM10").stream().collect(Collectors.averagingDouble(Double::doubleValue));
- double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
- data.put("PM10",rsAvg);
- }else {
- data.put("PM10",0);
- }
- if(mapValue.containsKey("SO2")){
- Double ListAvg = mapValue.get("SO2").stream().collect(Collectors.averagingDouble(Double::doubleValue));
- double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
- data.put("SO2",rsAvg);
- }else {
- data.put("SO2",0);
- }
- if(mapValue.containsKey("NO2")){
- Double ListAvg = mapValue.get("NO2").stream().collect(Collectors.averagingDouble(Double::doubleValue));
- double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
- data.put("NO2",rsAvg);
- }else {
- data.put("NO2",0);
- }
- if(mapValue.containsKey("CO")){
- Double ListAvg = percentile(mapValue.get("CO"),95d);
- double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
- data.put("CO",rsAvg);
- }else {
- data.put("CO",0);
- }
- if(mapValue.containsKey("O3")){
- Double ListAvg = percentile(mapValue.get("O3"),90d);
- double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
- data.put("O3",rsAvg);
- }else {
- data.put("O3",0);
- }
- if(mapValue.containsKey("TVOC")){
- Double ListAvg = mapValue.get("TVOC").stream().collect(Collectors.averagingDouble(Double::doubleValue));
- double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
- data.put("TVOC",rsAvg);
- }else {
- data.put("TVOC",0);
- }
- Double resultNum = ComprehensiveIndexUtils.dailyData(data);
- 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())));
- monitoringStationDTO.setTovc(BigDecimal.valueOf(Double.parseDouble(data.get("TVOC").toString())));
- monitoringStationDTO.setComposite(BigDecimal.valueOf(resultNum));
- monitoringStationDTO.setMac(mapKey);
- list.add(monitoringStationDTO);
- }
- List<MonitoringStationDTO> compositeList = list.stream().sorted(Comparator.comparing(MonitoringStationDTO::getComposite).reversed()).collect(Collectors.toList());
- List<MonitoringStationDTO> pM25List = list.stream().sorted(Comparator.comparing(MonitoringStationDTO::getPM25).reversed()).collect(Collectors.toList());
- List<MonitoringStationDTO> o3List = list.stream().sorted(Comparator.comparing(MonitoringStationDTO::getO3).reversed()).collect(Collectors.toList());
- List<MonitoringStationDTO> tovcList = list.stream().sorted(Comparator.comparing(MonitoringStationDTO::getTovc).reversed()).collect(Collectors.toList());
- List<MonitoringStationDTO> resultList = new ArrayList<>();
- LambdaQueryChainWrapper<Device> wrapper = deviceService.lambdaQuery();
- wrapper.eq(Device::getIsDelete,0);
- Map<String,String> deviceMap = new HashMap<>();
- wrapper.list().forEach(it->deviceMap.put(it.getMac(),it.getName()));
- int num = 1;
- for (MonitoringStationDTO m :compositeList ){
- MonitoringStationDTO monit = new MonitoringStationDTO();
- String mac = m.getMac();
- monit.setMac(mac);
- monit.setName(deviceMap.get(mac));
- monit.setComposite(m.getComposite());
- monit.setCompositeNum(num);
- 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(listO3.indexOf(mac)+1);
- monit.setPM25(pM25List.get(listPM25.indexOf(mac)).getPM25());
- monit.setPM25Num(listPM25.indexOf(mac)+1);
- monit.setTovc(tovcList.get(listTovc.indexOf(mac)).getTovc());
- monit.setTOVCNum(listTovc.indexOf(mac)+1);
- num++;
- resultList.add(monit);
- }
- return resultList;
- }
-
-
@Override
public List<MonitoringStationDTO> listMonitoringStationDTO(Map<String, Object> params, int reportType, String startTime, String endTime) {
// List<String> macs = Arrays.asList(mac.split(","));
@@ -684,7 +525,6 @@
return list;
}
Map<String,Map<String,ArrayList<Double>>> resultMap = new HashMap<>();
- int zz = 0;
for(HistoryDaily h : historyDailyByMacAndTimeSlot) {
JSONObject jsonObject = JSONObject.parseObject(h.getValue());
Map<String, Object> map = jsonObject.getInnerMap();
@@ -715,8 +555,6 @@
maps.put("NO2",numResult);
}
if(Objects.nonNull(map.get("a21005"))){
- System.out.println(">>>"+map.toString());
- System.out.println(">>>"+map.get("a21005").toString());
ArrayList<Double> numResult = Objects.nonNull(maps.get("CO"))?maps.get("CO"):new ArrayList<>();
numResult.add(Double.parseDouble(map.get("a21005").toString()));
maps.put("CO",numResult);
@@ -727,7 +565,6 @@
maps.put("TVOC",numResult);
}
resultMap.put(h.getMac(),maps);
- zz++;
}
for(Map.Entry entry : resultMap.entrySet()){
String mapKey = (String) entry.getKey();
@@ -742,21 +579,21 @@
}
if(mapValue.containsKey("PM10")){
Double ListAvg = mapValue.get("PM10").stream().collect(Collectors.averagingDouble(Double::doubleValue));
- double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
+ double rsAvg = new BigDecimal(ListAvg).setScale(0, BigDecimal.ROUND_HALF_UP).doubleValue();
data.put("PM10",rsAvg);
}else {
data.put("PM10",0);
}
if(mapValue.containsKey("SO2")){
Double ListAvg = mapValue.get("SO2").stream().collect(Collectors.averagingDouble(Double::doubleValue));
- double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
+ double rsAvg = new BigDecimal(ListAvg).setScale(0, BigDecimal.ROUND_HALF_UP).doubleValue();
data.put("SO2",rsAvg);
}else {
data.put("SO2",0);
}
if(mapValue.containsKey("NO2")){
Double ListAvg = mapValue.get("NO2").stream().collect(Collectors.averagingDouble(Double::doubleValue));
- double rsAvg = new BigDecimal(ListAvg).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue();
+ double rsAvg = new BigDecimal(ListAvg).setScale(0, BigDecimal.ROUND_HALF_UP).doubleValue();
data.put("NO2",rsAvg);
}else {
data.put("NO2",0);
@@ -788,6 +625,10 @@
monitoringStationDTO.setO3(BigDecimal.valueOf(Double.parseDouble(data.get("O3").toString())));
monitoringStationDTO.setTovc(BigDecimal.valueOf(Double.parseDouble(data.get("TVOC").toString())));
monitoringStationDTO.setComposite(BigDecimal.valueOf(resultNum));
+ monitoringStationDTO.setSO2(BigDecimal.valueOf(Double.parseDouble(data.get("SO2").toString())));
+ monitoringStationDTO.setNO2(BigDecimal.valueOf(Double.parseDouble(data.get("NO2").toString())));
+ monitoringStationDTO.setPM10(BigDecimal.valueOf(Double.parseDouble(data.get("PM10").toString())));
+ monitoringStationDTO.setCO(BigDecimal.valueOf(Double.parseDouble(data.get("CO").toString())));
monitoringStationDTO.setMac(mapKey);
list.add(monitoringStationDTO);
}
@@ -795,12 +636,16 @@
List<MonitoringStationDTO> pM25List = fun3(list,2);
List<MonitoringStationDTO> o3List = fun3(list,3);
List<MonitoringStationDTO> tovcList = fun3(list,4);
+ List<MonitoringStationDTO> SO2List = fun3(list,5);
+ List<MonitoringStationDTO> NO2cList = fun3(list,6);
+ List<MonitoringStationDTO> PM10List = fun3(list,7);
+ List<MonitoringStationDTO> COList = fun3(list,8);
List<MonitoringStationDTO> resultList = new ArrayList<>();
LambdaQueryChainWrapper<Device> wrapper = deviceService.lambdaQuery();
wrapper.eq(Device::getIsDelete,0);
Map<String,String> deviceMap = new HashMap<>();
wrapper.list().forEach(it->deviceMap.put(it.getMac(),it.getName()));
- int num = 1;
+
for (MonitoringStationDTO m :compositeList ){
MonitoringStationDTO monit = new MonitoringStationDTO();
String mac = m.getMac();
@@ -817,7 +662,19 @@
monit.setPM25Num(pM25List.get(listPM25.indexOf(mac)).getPM25Num());
monit.setTovc(tovcList.get(listTovc.indexOf(mac)).getTovc());
monit.setTOVCNum(tovcList.get(listTovc.indexOf(mac)).getTOVCNum());
- //num++;
+ 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());
+ 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());
+ 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());
+ 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());
+
resultList.add(monit);
}
return resultList;
@@ -839,6 +696,18 @@
}else if(type == 4){
compositeList = monList.stream().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());
+ 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());
+ 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());
+ 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());
+ map1 = compositeList.stream().collect(Collectors.groupingBy(MonitoringStationDTO::getCO,LinkedHashMap::new,Collectors.toList()));
}
int index = 1;
for (Map.Entry entry : map1.entrySet()) {
@@ -858,6 +727,18 @@
}else if(type == 4){
stationDTO.setTovc(m.getTovc());
stationDTO.setTOVCNum(index);
+ }else if(type == 5){
+ stationDTO.setSO2(m.getSO2());
+ stationDTO.setSO2Num(index);
+ }else if(type == 6){
+ stationDTO.setNO2(m.getNO2());
+ stationDTO.setNO2Num(index);
+ }else if(type == 7){
+ stationDTO.setPM10(m.getPM10());
+ stationDTO.setPM10Num(index);
+ }else if(type == 8){
+ stationDTO.setCO(m.getCO());
+ stationDTO.setCONum(index);
}
resultList.add(stationDTO);
}
--
Gitblit v1.8.0