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/controller/AlarmRuleController.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleController.java
index 5d9a321..19ba210 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleController.java
@@ -173,4 +173,26 @@
 		return R.data(alarmRuleService.getDetail(id));
 	}
 
+	/**
+	 * 通过告警规则类型查询生成告警规则类型
+	 * @param alarmRuleType
+	 * @return
+	 */
+	@ApiOperation(value="通过告警规则类型查询生成告警规则类型", notes="通过告警规则类型查询生成告警规则类型")
+	@GetMapping(value = "/getCreateRuleType")
+	public R getCreateRuleType(String alarmRuleType) {
+		return R.data(alarmRuleService.getCreateRuleType(alarmRuleType));
+	}
+
+	/**
+	 * 通过成告警规则类型查询告警规则名称
+	 * @param createAlarmType
+	 * @return
+	 */
+	@ApiOperation(value="通过成告警规则类型查询告警规则名称", notes="通过成告警规则类型查询告警规则名称")
+	@GetMapping(value = "/getAlarmRuleName")
+	public R getAlarmRuleName(String createAlarmType) {
+		return R.data(alarmRuleService.getAlarmRuleName(createAlarmType));
+	}
+
 }

--
Gitblit v1.9.3