From d61a1d81e8dcaf8d0c8e0bd02e8914021aacb468 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 29 七月 2023 09:26:15 +0800
Subject: [PATCH] 3
---
src/main/java/com/yssh/service/WarningAnalyseService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java
index 02f36e8..d42c589 100644
--- a/src/main/java/com/yssh/service/WarningAnalyseService.java
+++ b/src/main/java/com/yssh/service/WarningAnalyseService.java
@@ -194,7 +194,17 @@
return result;
}
- public Map<String, List<Map<String, Object>>> countEverydayAlarmAndWarning() {
+ /**
+ * 姣忔棩棰勮銆佹姤璀︽暟閲忓彉鍖栬秼鍔�
+ */
+ public Map<String, List<Map<String, Object>>> everydayCount(Date endDate) {
+ Integer end = Integer.parseInt(DateUtils.getYyyyMmDdHh(endDate));
+ Date startDate = DateUtils.getAPeriodOfTime(endDate, -6, Calendar.DATE);
+ Integer start = Integer.parseInt(DateUtils.getYyyyMmDdHh(startDate));
+
+
+
+
Map<String, List<Map<String, Object>>> result = new HashMap<>();
Map<String, Object> param = new HashMap<String, Object>();
@@ -370,7 +380,7 @@
Integer start = Integer.parseInt(strStart);
Integer end = Integer.parseInt(strEnd);
- List<Qxsh> rsList = qxshMapper.selectByBeginAndEnd(start, end);
+ List<Qxsh> rsList = qxshMapper.selectForReport(start, end);
if (null == rsList || rsList.isEmpty()) return null;
Hashtable<String, Boolean> dict = getExistTabDict(rsList);
--
Gitblit v1.9.3