From 44251a92dc85a93eff59704b40b07830bde8d16f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 27 Jul 2023 15:38:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-job/src/main/java/com/moral/api/task/AlarmTask.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 103 insertions(+), 2 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/task/AlarmTask.java b/screen-job/src/main/java/com/moral/api/task/AlarmTask.java
index 4981ab6..3ac44c2 100644
--- a/screen-job/src/main/java/com/moral/api/task/AlarmTask.java
+++ b/screen-job/src/main/java/com/moral/api/task/AlarmTask.java
@@ -114,9 +114,14 @@
}
for (Device device:devices) {
AlarmInfo alarmInfo = new AlarmInfo();
+ Map<String,Object> alarmInfoMap = new HashMap<>();
alarmInfo.setAlarmTime(alarmDate);
+ alarmInfoMap.put("alarmTime",alarmTime);
int deviceId = device.getId();
alarmInfo.setDeviceId(deviceId);
+ alarmInfoMap.put("deviceId",deviceId);
+ String timeUtils = alarmTime.replace("-","");
+ timeUtils = timeUtils.substring(0,6);
String mac = device.getMac();
List<HistoryHourly> historyHourlys = null;
historyHourlys = historyHourlyService.getValueByMacAndTime(device.getMac(), nearDate, nearDate);
@@ -162,6 +167,10 @@
String alarmInformation = "������["+device.getName()+"][PM2.5]���������["+PM2_5+"]������������������������[75]";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","PM2_5");
+ alarmInfoMap.put("alarmType","������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
Double previousPM2_5 = null;
@@ -187,6 +196,10 @@
String alarmInformation = "["+device.getName()+"]["+beforTime+"][PM2.5]���������["+PM2_5+"]������������������������["+previousPM2_5+"]���"+multiple+"���";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","PM2_5");
+ alarmInfoMap.put("alarmType","���������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -214,10 +227,14 @@
sysAreaQueryWrapper.eq("area_code",cityCode);
SysArea sysArea = sysAreaMapper.selectOne(sysAreaQueryWrapper);
alarmInfo.setIndex("PM2_5");
- alarmInfo.setAlarmType("������������������"+multiple+"%");
+ alarmInfo.setAlarmType("������������������"+percentage+"%");
String alarmInformation = "["+device.getName()+"][PM2.5]���������["+PM2_5+"]������["+sysArea.getAreaName()+"]������["+cityAqiPM2_5+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","PM2_5");
+ alarmInfoMap.put("alarmType","������������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -251,10 +268,14 @@
sysAreaQueryWrapper.eq("guid",guid);
GovMonitorPoint govMonitorPoint = govMonitorPointMapper.selectOne(sysAreaQueryWrapper);
alarmInfo.setIndex("PM2_5");
- alarmInfo.setAlarmType("���������������"+multiple+"%");
+ alarmInfo.setAlarmType("���������������"+percentage+"%");
String alarmInformation = "["+device.getName()+"][PM2.5]���������["+PM2_5+"]������["+govMonitorPoint.getName()+"]������["+govMonitorPointPM2_5+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","PM2_5");
+ alarmInfoMap.put("alarmType","���������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -267,6 +288,10 @@
String alarmInformation = "������["+device.getName()+"][PM10]���������["+PM10+"]������������������������[150]";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","PM10");
+ alarmInfoMap.put("alarmType","������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
Double previousPM10 = null;
@@ -292,6 +317,10 @@
String alarmInformation = "["+device.getName()+"]["+beforTime+"][PM10]���������["+PM10+"]������������������������["+previousPM10+"]���"+multiple+"���";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","PM10");
+ alarmInfoMap.put("alarmType","���������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -323,6 +352,10 @@
String alarmInformation = "["+device.getName()+"][PM10]���������["+PM10+"]������["+sysArea.getAreaName()+"]������["+cityAqiPM10+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","PM10");
+ alarmInfoMap.put("alarmType","������������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -360,6 +393,10 @@
String alarmInformation = "["+device.getName()+"][PM10]���������["+PM10+"]������["+govMonitorPoint.getName()+"]������["+govMonitorPointPM10+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","PM10");
+ alarmInfoMap.put("alarmType","���������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -372,6 +409,10 @@
String alarmInformation = "������["+device.getName()+"][SO2]���������["+SO2+"]������������������������[75]";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","SO2");
+ alarmInfoMap.put("alarmType","������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
Double previousSO2 = null;
@@ -397,6 +438,10 @@
String alarmInformation = "["+device.getName()+"]["+beforTime+"][SO2]���������["+SO2+"]������������������������["+previousSO2+"]���"+multiple+"���";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","SO2");
+ alarmInfoMap.put("alarmType","������������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -428,6 +473,10 @@
String alarmInformation = "["+device.getName()+"][SO2]���������["+SO2+"]������["+sysArea.getAreaName()+"]������["+cityAqiSO2+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","SO2");
+ alarmInfoMap.put("alarmType","������������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -465,6 +514,10 @@
String alarmInformation = "["+device.getName()+"][SO2]���������["+SO2+"]������["+govMonitorPoint.getName()+"]������["+govMonitorPointSO2+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","SO2");
+ alarmInfoMap.put("alarmType","���������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -477,6 +530,10 @@
String alarmInformation = "������["+device.getName()+"][NO2]���������["+NO2+"]������������������������[75]";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","NO2");
+ alarmInfoMap.put("alarmType","������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
Double previousNO2 = null;
@@ -502,6 +559,10 @@
String alarmInformation = "["+device.getName()+"]["+beforTime+"][NO2]���������["+NO2+"]������������������������["+previousNO2+"]���"+multiple+"���";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","NO2");
+ alarmInfoMap.put("alarmType","���������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -533,6 +594,10 @@
String alarmInformation = "["+device.getName()+"][NO2]���������["+NO2+"]������["+sysArea.getAreaName()+"]������["+cityAqiNO2+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","NO2");
+ alarmInfoMap.put("alarmType","������������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -570,6 +635,10 @@
String alarmInformation = "["+device.getName()+"][NO2]���������["+NO2+"]������["+govMonitorPoint.getName()+"]������["+govMonitorPointNO2+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","NO2");
+ alarmInfoMap.put("alarmType","���������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -582,6 +651,10 @@
String alarmInformation = "������["+device.getName()+"][CO]���������["+CO+"]������������������������[75]";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","CO");
+ alarmInfoMap.put("alarmType","������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
Double previousCO = null;
@@ -607,6 +680,10 @@
String alarmInformation = "["+device.getName()+"]["+beforTime+"][CO]���������["+CO+"]������������������������["+previousCO+"]���"+multiple+"���";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","CO");
+ alarmInfoMap.put("alarmType","���������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -638,6 +715,10 @@
String alarmInformation = "["+device.getName()+"][CO]���������["+CO+"]������["+sysArea.getAreaName()+"]������["+cityAqiCO+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","CO");
+ alarmInfoMap.put("alarmType","������������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -675,6 +756,10 @@
String alarmInformation = "["+device.getName()+"][CO]���������["+CO+"]������["+govMonitorPoint.getName()+"]������["+govMonitorPointCO+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","CO");
+ alarmInfoMap.put("alarmType","���������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -687,6 +772,10 @@
String alarmInformation = "������["+device.getName()+"][O3]���������["+O3+"]������������������������[75]";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","O3");
+ alarmInfoMap.put("alarmType","������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
Double previousO3 = null;
@@ -712,6 +801,10 @@
String alarmInformation = "["+device.getName()+"]["+beforTime+"][O3]���������["+O3+"]������������������������["+previousO3+"]���"+multiple+"���";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","O3");
+ alarmInfoMap.put("alarmType","���������");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -743,6 +836,10 @@
String alarmInformation = "["+device.getName()+"][O3]���������["+O3+"]������["+sysArea.getAreaName()+"]������["+cityAqiO3+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","O3");
+ alarmInfoMap.put("alarmType","������������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
@@ -780,6 +877,10 @@
String alarmInformation = "["+device.getName()+"][O3]���������["+O3+"]������["+govMonitorPoint.getName()+"]������["+govMonitorPointO3+"]���"+percentage+"%";
alarmInfo.setAlarmInformation(alarmInformation);
alarmInfoMapper.insert(alarmInfo);
+ alarmInfoMap.put("index","O3");
+ alarmInfoMap.put("alarmType","���������������"+percentage+"%");
+ alarmInfoMap.put("alarmInformation",alarmInformation);
+ alarmInfoMapper.insertAlarmInfo(timeUtils, alarmInfoMap);
continue;
}
}
--
Gitblit v1.8.0