From 498718ad129e8a9010e6f2af2fde2f9d4508fd32 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 09 六月 2023 10:41:49 +0800
Subject: [PATCH] 修改本月预警报警统计接口
---
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index 92ae1fc..55af0f0 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -206,20 +206,23 @@
public Map<String, Integer> countThisMonthAlarmAndWarning() {
Map<String, Integer> result = new HashMap<>();
Map<String, Object> param = new HashMap<>();
+ param.put("startTime", ymdhms.format(DateUtils.getMonthStart()));
+ param.put("endTime", ymdhms.format(DateUtils.getMonthEnd()));
+
param.put("type", 0);
- param.put("startTime", DateUtils.getMonthStart());
- param.put("endTime", DateUtils.getMonthEnd());
List<WarningVo> alarms = warningDetailMapper.selectWarningDetailByMap(param);
if (StringUtils.isNull(alarms)) {
alarms = new ArrayList<>();
}
result.put("alarmNumber", alarms.size());
+
param.put("type", 1);
List<WarningVo> warnings = warningDetailMapper.selectWarningDetailByMap(param);
if (StringUtils.isNull(warnings)) {
warnings = new ArrayList<>();
}
result.put("warningNumber", warnings.size());
+
return result;
}
--
Gitblit v1.9.3