From 1a5bfb9a86393572f1d6de6eacbcee682be32b46 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 06 Mar 2024 17:38:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.java
index b8c111d..95f1d93 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.java
@@ -37,6 +37,14 @@
 	List<StatisticAlarmRecord> statisticAlarmRecordByType(@Param("alarmRecord") AlarmRecordVO alarmRecord);
 
 	/**
+	 * 查询大坝安全告警统计数据
+	 * @param alarmRecord
+	 * @return
+	 */
+	@InterceptorIgnore(tenantLine = "true")
+	List<StatisticAlarmRecord> statisticAlarmRecordByAlarmRuleType(@Param("alarmRecord") AlarmRecordVO alarmRecord);
+
+	/**
 	 * 查询告警统计数据
 	 * @param alarmRecord
 	 * @return

--
Gitblit v1.9.3