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/sms/controller/SmsTemplateController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java
index 191d93e..28ab5fc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java
@@ -41,6 +41,12 @@
return R.data(pageList);
}
+ @ApiOperation(value="短信发送模板-分页列表查询", notes="短信发送模板-分页列表查询")
+ @GetMapping(value = "/listAll")
+ public R listAll(SmsTemplate smsTemplate) {
+ return R.data(smsTemplateService.list(Condition.getQueryWrapper(smsTemplate)));
+ }
+
/**
* 自定义列表查询
@@ -110,4 +116,14 @@
return R.data(SmsTemplate);
}
+ /**
+ * 获取短信类型树（当为告警是显示告警规则名称）
+ *
+ * @return
+ */
+ @GetMapping(value = "/getSmsTypeTree")
+ public R getSmsTypeTree() {
+ return R.data(smsTemplateService.getSmsTypeTree());
+ }
+
}
--
Gitblit v1.9.3