From 4b4a150626f7943ee0811d7c3c718be0abe68b23 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 29 七月 2023 10:41:41 +0800
Subject: [PATCH] 6
---
src/main/java/com/yssh/service/WarningAnalyseService.java | 67 +++++++++------------------------
1 files changed, 19 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java
index 408fd2c..6c5422e 100644
--- a/src/main/java/com/yssh/service/WarningAnalyseService.java
+++ b/src/main/java/com/yssh/service/WarningAnalyseService.java
@@ -51,7 +51,7 @@
@Async("threadPoolTaskExecutor")
public void insertWarningDetails(List<WarningDetail> warning) throws Exception {
- //鎻掑叆鏁版嵁
+ // 鎻掑叆鏁版嵁
List<List<WarningDetail>> list = Lists.partition(warning, AsyncService.BATCH_INSERT_NUMBER);
CountDownLatch countDownLatch = new CountDownLatch(list.size());
for (List<WarningDetail> corpReserveList : list) {
@@ -60,30 +60,15 @@
countDownLatch.await();
}
- public List<WarningVo> getRunTimeAlarmAnalyse() {
- List<WarningVo> result = new ArrayList<>();
- Date nowDate = DateUtils.getNowDate();
- //String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, nowDate);
- //DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
- //if (StringUtils.isNull(dictRecord)) {
- // nowDate = DateUtils.getAPeriodOfTime(nowDate, -1, Calendar.HOUR_OF_DAY);
- //}
- //List<WarningDetail> list = alarmAnalyseOperation(nowDate);
+ /**
+ * 鑾峰彇瀹炴椂鎶ヨ
+ */
+ 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));
- List<WarningDetail> list = new ArrayList<>();
- Calendar calendar = getCalendar(nowDate);
- for (int i = 0; i < 8; i++) {
- calendar.add(Calendar.HOUR, -1);
- List<WarningDetail> rs = getAlarmWarnAnalyse(calendar.getTime(), false);
- if (null != rs && rs.size() > 0) {
- list.addAll(rs);
- }
- }
- list.forEach(s -> {
- String time = DateUtils.getYyyyMmDdHh(s.getCreateTime());
- result.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue(), time));
- });
- return result;
+ return qxshMapper.selectAlarmByBeginAndEnd(start, end);
}
private Calendar getCalendar(Date nowDate) {
@@ -94,30 +79,15 @@
return calendar;
}
- public List<WarningVo> getRunTimeWarningAnalyse() {
- List<WarningVo> result = new ArrayList<>();
- Date nowDate = DateUtils.getNowDate();
- //String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, nowDate);
- //DictRecord dictRecord = dictRecordMapper.selectByCreateTime(Long.parseLong(time));
- //if (StringUtils.isNull(dictRecord)) {
- // nowDate = DateUtils.getAPeriodOfTime(nowDate, -1, Calendar.HOUR_OF_DAY);
- //}
- //List<WarningDetail> list = warningAnalyseOperation(nowDate);
+ /**
+ * 鑾峰彇瀹炴椂棰勮
+ */
+ 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));
- List<WarningDetail> list = new ArrayList<>();
- Calendar calendar = getCalendar(nowDate);
- for (int i = 0; i < 8; i++) {
- calendar.add(Calendar.HOUR, -1);
- List<WarningDetail> rs = getAlarmWarnAnalyse(calendar.getTime(), true);
- if (null != rs && rs.size() > 0) {
- list.addAll(rs);
- }
- }
- list.forEach(s -> {
- String time = DateUtils.getYyyyMmDdHh(s.getCreateTime());
- result.add(new WarningVo(s.getLocationName(), s.getSuYuanId(), 0.0, 0.0, s.getValue(), time));
- });
- return result;
+ return qxshMapper.selectWarnByBeginAndEnd(start, end);
}
private List<WarningDetail> getAlarmWarnAnalyse(Date date, boolean isWarn) {
@@ -145,6 +115,7 @@
return result;
}
+ // 宸插簾寮� *
public void warningOperationStorage(Date date) {
List<WarningDetail> allData = new ArrayList<>();
List<WarningDetail> alarms = this.getAlarmWarnAnalyse(date, false);
@@ -213,7 +184,7 @@
Integer start = Integer.parseInt(DateUtils.getYyyyMmDdHh(startDate));
// List<String> times = DateUtils.get3Hours();
- List<Qxsh> list = qxshMapper.selectByBeginAndEnd(start, end);
+ List<Qxsh> list = qxshMapper.select3Hours(start, end);
if (null == list || list.isEmpty()) {
return null;
}
--
Gitblit v1.9.3