From 5579b3cf5d5e2a5b7ec90c89fa843639ba7e2a87 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 27 四月 2023 12:42:17 +0800
Subject: [PATCH] 修改告警和预警数据入库方法
---
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 66 ++++++++++-----------------------
1 files changed, 20 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index 55af0f0..59c84fe 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -83,7 +83,7 @@
Calendar calendar = getCalendar(nowDate);
for (int i = 0; i < 3; i++) {
calendar.add(Calendar.HOUR, -1);
- List<WarningDetail> rs = alarmAnalyseOperation(calendar.getTime());
+ List<WarningDetail> rs = getAlarmWarnAnalyse(calendar.getTime(), false);
if (null != rs && rs.size() > 0) {
list.addAll(rs);
}
@@ -117,7 +117,7 @@
Calendar calendar = getCalendar(nowDate);
for (int i = 0; i < 3; i++) {
calendar.add(Calendar.HOUR, -1);
- List<WarningDetail> rs = warningAnalyseOperation(calendar.getTime());
+ List<WarningDetail> rs = getAlarmWarnAnalyse(calendar.getTime(), true);
if (null != rs && rs.size() > 0) {
list.addAll(rs);
}
@@ -128,70 +128,44 @@
return result;
}
- public List<WarningDetail> alarmAnalyseOperation(Date date) {
- List<WarningDetail> result = new ArrayList<>();
- String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, date);
+ private List<WarningDetail> getAlarmWarnAnalyse(Date date, boolean isWarn) {
List<String> ids = CalculateUtils.assembleId(commonService.getCheckPoints3d());
- if (ids.size() == 0) {
- return result;
- }
- DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
- if (null == dictRecord) {
- return result;
- }
- String tableName = dictRecord.getTableName();
- if (suYuanMapper.isTableExists(tableName) == 0) {
- return result;
- }
- List<SuYuan2d> list = suYuanMapper.getAlarmsAnalyse(tableName, ids);
- if (null != list && list.size() > 0) {
- for (SuYuan2d s : list) {
- String locationName = commonService.select3dCheckPointById(s.getId()).getName();
- result.add(new WarningDetail(0L, tableName, s.getId(), locationName, date, 0, s.getValue()));
- }
- }
-
- return result;
- }
-
- public List<WarningDetail> warningAnalyseOperation(Date date) {
- List<WarningDetail> result = new ArrayList<>();
String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, date);
- List<String> ids = CalculateUtils.assembleId(commonService.getCheckPoints3d());
- if (ids.size() == 0) {
- return result;
- }
DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
- if (null == dictRecord) {
- return result;
- }
+ if (null == dictRecord) return null;
+
String tableName = dictRecord.getTableName();
- if (suYuanMapper.isTableExists(tableName) == 0) {
- return result;
+ if (suYuanMapper.isTableExists(tableName) == 0) return null;
+
+ List<SuYuan2d> list = isWarn ? suYuanMapper.getWarningAnalyse(tableName, ids) : suYuanMapper.getAlarmsAnalyse(tableName, ids);
+ if (null == list || list.isEmpty()) {
+ return null;
}
- List<SuYuan2d> list = suYuanMapper.getWarningAnalyse(tableName, ids);
- if (null != list && list.size() > 0) {
- for (SuYuan2d s : list) {
- String locationName = commonService.select3dCheckPointById(s.getId()).getName();
- result.add(new WarningDetail(0L, tableName, s.getId(), locationName, date, 1, s.getValue()));
- }
+ int type = isWarn ? 1 : 0;
+ List<WarningDetail> result = new ArrayList<>();
+ for (SuYuan2d s : list) {
+ String locationName = commonService.select3dCheckPointById(s.getId()).getName();
+ result.add(new WarningDetail(0L, tableName, s.getId(), locationName, date, type, s.getValue()));
}
+
return result;
}
@Override
public void warningOperationStorage(Date date) {
List<WarningDetail> allData = new ArrayList<>();
- List<WarningDetail> alarms = this.alarmAnalyseOperation(date);
+ List<WarningDetail> alarms = this.getAlarmWarnAnalyse(date, false);
if (StringUtils.isNotEmpty(alarms)) {
allData.addAll(alarms);
}
- List<WarningDetail> warnings = this.warningAnalyseOperation(date);
+
+ List<WarningDetail> warnings = this.getAlarmWarnAnalyse(date, true);
if (StringUtils.isNotEmpty(warnings)) {
allData.addAll(warnings);
}
+
if (StringUtils.isNotEmpty(allData)) {
try {
insertWarningDetails(allData);
--
Gitblit v1.9.3