From 4f6ab072edba2f4452f7948dc36e0272863048c8 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 29 七月 2023 10:42:55 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/WarningAnalyseService.java | 54 +++++++++++++++++++++++-------------------------------
1 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java
index 6c5422e..f04b5d4 100644
--- a/src/main/java/com/yssh/service/WarningAnalyseService.java
+++ b/src/main/java/com/yssh/service/WarningAnalyseService.java
@@ -71,14 +71,6 @@
return qxshMapper.selectAlarmByBeginAndEnd(start, end);
}
- private Calendar getCalendar(Date nowDate) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(nowDate);
- calendar.add(Calendar.HOUR, 1);
-
- return calendar;
- }
-
/**
* 鑾峰彇瀹炴椂棰勮
*/
@@ -88,6 +80,29 @@
Integer start = Integer.parseInt(DateUtils.getYyyyMmDdHh(startDate));
return qxshMapper.selectWarnByBeginAndEnd(start, end);
+ }
+
+ // 宸插簾寮� *
+ public void warningOperationStorage(Date date) {
+ List<WarningDetail> allData = new ArrayList<>();
+ List<WarningDetail> alarms = this.getAlarmWarnAnalyse(date, false);
+ if (StringUtils.isNotEmpty(alarms)) {
+ allData.addAll(alarms);
+ }
+
+ List<WarningDetail> warnings = this.getAlarmWarnAnalyse(date, true);
+ if (StringUtils.isNotEmpty(warnings)) {
+ allData.addAll(warnings);
+ }
+
+ if (StringUtils.isNotEmpty(allData)) {
+ try {
+ insertWarningDetails(allData);
+ } catch (Exception e) {
+ logger.error("鎵归噺鎻掑叆鍛婅鏁版嵁鍑虹幇寮傚父锛侊紒锛�", e);
+ e.printStackTrace();
+ }
+ }
}
private List<WarningDetail> getAlarmWarnAnalyse(Date date, boolean isWarn) {
@@ -113,29 +128,6 @@
}
return result;
- }
-
- // 宸插簾寮� *
- public void warningOperationStorage(Date date) {
- List<WarningDetail> allData = new ArrayList<>();
- List<WarningDetail> alarms = this.getAlarmWarnAnalyse(date, false);
- if (StringUtils.isNotEmpty(alarms)) {
- allData.addAll(alarms);
- }
-
- List<WarningDetail> warnings = this.getAlarmWarnAnalyse(date, true);
- if (StringUtils.isNotEmpty(warnings)) {
- allData.addAll(warnings);
- }
-
- if (StringUtils.isNotEmpty(allData)) {
- try {
- insertWarningDetails(allData);
- } catch (Exception e) {
- logger.error("鎵归噺鎻掑叆鍛婅鏁版嵁鍑虹幇寮傚父锛侊紒锛�", e);
- e.printStackTrace();
- }
- }
}
/**
--
Gitblit v1.9.3