From 2a4e0a1c07d0d109d80d1d0cbcdd6b7be40c8bbc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 31 七月 2023 11:07:31 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/WarningAnalyseService.java | 110 +++++++++++++++++++++++++-----------------------------
1 files changed, 51 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java
index f04b5d4..2557340 100644
--- a/src/main/java/com/yssh/service/WarningAnalyseService.java
+++ b/src/main/java/com/yssh/service/WarningAnalyseService.java
@@ -18,7 +18,6 @@
import org.springframework.stereotype.Service;
import com.google.common.collect.Lists;
-import com.yssh.entity.WarningVo;
import javax.annotation.Resource;
@@ -63,71 +62,15 @@
/**
* 鑾峰彇瀹炴椂鎶ヨ
*/
- public List<Qxsh> getRunTimeAlarmAnalyse(Date endDate) {
- Integer end = Integer.parseInt(DateUtils.getYyyyMmDdHh(endDate));
- Date startDate = DateUtils.getAPeriodOfTime(endDate, -5, Calendar.HOUR_OF_DAY);
- Integer start = Integer.parseInt(DateUtils.getYyyyMmDdHh(startDate));
-
+ public List<Qxsh> getRunTimeAlarmAnalyse(Integer start, Integer end) {
return qxshMapper.selectAlarmByBeginAndEnd(start, end);
}
/**
* 鑾峰彇瀹炴椂棰勮
*/
- public List<Qxsh> getRunTimeWarningAnalyse(Date endDate) {
- Integer end = Integer.parseInt(DateUtils.getYyyyMmDdHh(endDate));
- Date startDate = DateUtils.getAPeriodOfTime(endDate, -5, Calendar.HOUR_OF_DAY);
- Integer start = Integer.parseInt(DateUtils.getYyyyMmDdHh(startDate));
-
+ public List<Qxsh> getRunTimeWarningAnalyse(Integer start, Integer end) {
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) {
- List<String> ids = CalculateUtils.assembleId(commonService.getCheckPoints3d());
-
- String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, date);
- DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
- if (null == dictRecord) return null;
-
- String tableName = dictRecord.getTableName();
- 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;
- }
-
- 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;
}
/**
@@ -270,4 +213,53 @@
return null;
}
+
+ // 宸插簾寮� *
+ 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) {
+ List<String> ids = CalculateUtils.assembleId(commonService.getCheckPoints3d());
+
+ String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, date);
+ DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
+ if (null == dictRecord) return null;
+
+ String tableName = dictRecord.getTableName();
+ 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;
+ }
+
+ 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;
+ }
}
--
Gitblit v1.9.3