From 25169ce9015c91b1596619fcc27b5554bd73bee7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 29 七月 2023 10:18:14 +0800
Subject: [PATCH] 5
---
src/main/java/com/yssh/service/WarningAnalyseService.java | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java
index 515c4c1..408fd2c 100644
--- a/src/main/java/com/yssh/service/WarningAnalyseService.java
+++ b/src/main/java/com/yssh/service/WarningAnalyseService.java
@@ -167,30 +167,22 @@
}
}
- public Map<String, Integer> countThisMonthAlarmAndWarning() {
+ /**
+ * 鏈湀棰勮鎶ヨ缁熻
+ */
+ public Map<String, Integer> monthCount(Date date) {
+ Date startDate = DateUtils.getMonthStart(date);
+ Date endDate = DateUtils.getMonthEnd(date);
+ Integer start = Integer.parseInt(DateUtils.getYyyyMmDdHh(startDate));
+ Integer end = Integer.parseInt(DateUtils.getYyyyMmDdHh(endDate));
+
Map<String, Integer> result = new HashMap<>();
- Map<String, Object> param = new HashMap<>();
- param.put("startTime", DateUtils.getYyyyMmDdHhMmSs(DateUtils.getMonthStart()));
- param.put("endTime", DateUtils.getYyyyMmDdHhMmSs(DateUtils.getMonthEnd()));
-
- /*param.put("type", 0);
- List<WarningVo> alarms = warningDetailMapper.selectWarningDetailByMap(param);
- if (StringUtils.isNull(alarms)) {
- alarms = new ArrayList<>();
- }
- result.put("alarmNumber", alarms.size());*/
- Integer alarmNum = warningDetailMapper.countAlarmByMap(param);
- result.put("alarmNumber", null == alarmNum ? 0 : alarmNum);
-
- param.put("type", 1);
- /*List<WarningVo> warnings = warningDetailMapper.selectWarningDetailByMap(param);
- if (StringUtils.isNull(warnings)) {
- warnings = new ArrayList<>();
- }
- result.put("warningNumber", warnings.size());*/
- Integer warnNum = warningDetailMapper.countWarnByMap(param);
+ Integer warnNum = qxshMapper.countMonthForWarn(start, end);
result.put("warningNumber", null == warnNum ? 0 : warnNum);
+ Integer alarmNum = qxshMapper.countMonthForAlarm(start, end);
+ result.put("alarmNumber", null == alarmNum ? 0 : alarmNum);
+
return result;
}
--
Gitblit v1.9.3