From 41a83e40f815a01bfe314538c06f285e7085eed5 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 20 Jun 2024 09:23:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
index 2250a33..e603683 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
@@ -162,4 +162,15 @@
 		return R.data(alarmRecordService.statisticAlarmRecord(alarmRecord));
 	}
 
+	/**
+	 * 告警统计按告警分类-等级统计
+	 * @param alarmRecord
+	 * @return
+	 */
+	@ApiOperation(value="告警记录-告警统计按告警分类-等级统计", notes="告警记录-告警统计按告警分类-等级统计")
+	@GetMapping(value = "/statisticAlaByTypeAndLev")
+	public R statisticAlaByTypeAndLev(AlarmRecordVO alarmRecord) {
+		return R.data(alarmRecordService.statisticAlaByTypeAndLev(alarmRecord));
+	}
+
 }

--
Gitblit v1.9.3