From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
index 66c8748..fc98fa7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
@@ -48,6 +48,21 @@
}
/**
+ * 按行政区统计告警-按三大类
+ * @param alarmRecord
+ * @return
+ */
+ @Override
+ public Object statisticAlarmRecordByType(AlarmRecordVO alarmRecord) {
+ // 获取当前用户的行政区划
+ String adCode = "420000000000";
+ // 查询统计数据
+ List<StatisticAlarmRecord> list = baseMapper.statisticAlarmRecordByType(alarmRecord);
+ // 返回数据
+ return list;
+ }
+
+ /**
* 按行政区统计告警
* @param alarmRecord
* @return
@@ -63,7 +78,7 @@
// 查询统计数据
List<StatisticAlarmRecord> list = baseMapper.statisticAlarmRecord(alarmRecord);
// 按行政区分组
- Map<String, List<StatisticAlarmRecord>> listMap = list.stream().collect(Collectors.groupingBy(StatisticAlarmRecord::getAdName));
+ Map<String, List<StatisticAlarmRecord>> listMap = list.stream().filter(item->null!=item.getAdName()).collect(Collectors.groupingBy(StatisticAlarmRecord::getAdName));
// 补全行政区
for (String adName : adNameList) {
if (!listMap.containsKey(adName)){
--
Gitblit v1.9.3