From b1887a4148d3e1575def33a3a4d135f498e1175d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 15 五月 2023 11:21:47 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index 234f6b4..a85700e 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -12,9 +12,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -235,17 +232,21 @@
@Override
public Map<String, List<Map<String, Object>>> countEverydayAlarmAndWarning() {
Map<String, List<Map<String, Object>>> result = new HashMap<>();
+
Map<String, Object> param = new HashMap<String, Object>();
+ Date now = new Date();
+ Date last = DateUtils.getAPeriodOfTime(now, -7, Calendar.DATE); // 涓婂懆鐨勪粖澶�
+ param.put("startTime", ymdhms.format(last));
+ param.put("endTime", ymdhms.format(now));
+
param.put("type", 0);
- Date endTime = DateUtils.getNowDate();
- //涓婂懆鐨勪粖澶�
- param.put("startTime", DateUtils.getAPeriodOfTime(endTime, -7, Calendar.DATE));
- param.put("endTime", endTime);
List<Map<String, Object>> alarmDayCount = warningDetailMapper.selectWarningDayCountByMap(param);
result.put("alarmDayCount", alarmDayCount);
+
param.put("type", 1);
List<Map<String, Object>> warningDayCount = warningDetailMapper.selectWarningDayCountByMap(param);
result.put("warningDayCount", warningDayCount);
+
return result;
}
--
Gitblit v1.9.3