From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +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 | 19 +++++++++++++++++++
1 files changed, 19 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 d8f5b33..f88142f 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
@@ -26,6 +26,8 @@
*/
List<AlarmRecordVO> selectAlarmRecordPage(IPage<AlarmRecordVO> page,@Param("alarmRecord") AlarmRecordVO alarmRecord);
+ AlarmRecordVO getVODetail(@Param("id") Long id);
+
/**
* 查询告警统计数据-按三大类
* @param alarmRecord
@@ -33,6 +35,14 @@
*/
@InterceptorIgnore(tenantLine = "true")
List<StatisticAlarmRecord> statisticAlarmRecordByType(@Param("alarmRecord") AlarmRecordVO alarmRecord);
+
+ /**
+ * 查询大坝安全告警统计数据
+ * @param alarmRecord
+ * @return
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ List<StatisticAlarmRecord> statisticAlarmRecordByAlarmRuleType(@Param("alarmRecord") AlarmRecordVO alarmRecord);
/**
* 查询告警统计数据
@@ -49,9 +59,18 @@
List<String> getAdNameList(@Param("adCode") String adCode);
/**
+ * 按行政区code行政区
+ * @param adCode
+ * @return
+ */
+ List<String> getAdNameListByAdCode(@Param("adCode") String adCode);
+
+ /**
* 查询符合条件的告警类型
* @param alarmRecord
* @return
*/
List<AlarmRule> listAlarmRule(@Param("alarmRecord") AlarmRecordVO alarmRecord);
+
+
}
--
Gitblit v1.9.3