From 72802b92d42a9afe27ae2c977245eb8629ab7526 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 19 六月 2023 13:53:24 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index 51c7c17..a0de8aa 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -185,19 +185,23 @@
param.put("startTime", ymdhms.format(DateUtils.getMonthStart()));
param.put("endTime", ymdhms.format(DateUtils.getMonthEnd()));
- param.put("type", 0);
+ /*param.put("type", 0);
List<WarningVo> alarms = warningDetailMapper.selectWarningDetailByMap(param);
if (StringUtils.isNull(alarms)) {
alarms = new ArrayList<>();
}
- result.put("alarmNumber", alarms.size());
+ 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);
+ /*List<WarningVo> warnings = warningDetailMapper.selectWarningDetailByMap(param);
if (StringUtils.isNull(warnings)) {
warnings = new ArrayList<>();
}
- result.put("warningNumber", warnings.size());
+ result.put("warningNumber", warnings.size());*/
+ Integer warnNum = warningDetailMapper.countWarnByMap(param);
+ result.put("warningNumber", null == warnNum ? 0 : warnNum);
return result;
}
--
Gitblit v1.9.3