fix: alert template (#795)

traas-stack · Feb 2, 2024 · d51d6d7 · d51d6d7
1 parent 93b546c
commit d51d6d7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/...home/home-alert/src/main/java/io/holoinsight/server/home/alert/plugin/GatewayService.java b/...home/home-alert/src/main/java/io/holoinsight/server/home/alert/plugin/GatewayService.java
@@ -128,10 +128,10 @@ public boolean sendAlertNotifyV3(AlertNotifyRequest notify, AlertNotifyRecordLat
     notify.setAlertRuleExtra(extra);
     NotificationTemplate notificationTemplate = extra == null ? null : extra.getDingTalkTemplate();
     if (notificationTemplate == null) {
-      Long alertNotificationTemplateId = alertRule.getAlertNotificationTemplateId();
-      if (alertNotificationTemplateId != null) {
+      String alertRuleAlertTemplateUuid = alertRule.getAlertTemplateUuid();
+      if (StringUtils.isNotEmpty(alertRuleAlertTemplateUuid)) {
         AlertTemplate alertTemplate =
-            this.alertTemplateMapper.selectById(alertNotificationTemplateId);
+            this.alertTemplateMapper.selectById(alertRuleAlertTemplateUuid);
         if (alertTemplate != null) {
           AlertTemplateDTO templateDTO = this.alertTemplateConverter.doToDTO(alertTemplate);
           notificationTemplate = templateDTO.templateConfig;

diff --git a/...-web/src/main/java/io/holoinsight/server/home/web/controller/AlertTemplateFacadeImpl.java b/...-web/src/main/java/io/holoinsight/server/home/web/controller/AlertTemplateFacadeImpl.java
@@ -243,6 +243,7 @@ public void doManage() {
         if (StringUtils.isNotBlank(pageRequest.getTarget().templateName)) {
           queryWrapper.like("template_name", pageRequest.getTarget().templateName);
         }
+        queryWrapper.orderByDesc("gmt_modified");
 
         Page<AlertTemplate> p = alertTemplateMapper.selectPage(page, queryWrapper);
         MonitorPageResult<AlertTemplateDTO> pageResult = new MonitorPageResult<>();
@@ -286,8 +287,8 @@ public void doManage() {
   @PostMapping("/check")
   @ResponseBody
   @MonitorScopeAuth(targetType = AuthTargetType.TENANT, needPower = PowerConstants.EDIT)
-  public JsonResult<Boolean> checkTemplateText(@RequestBody AlertTemplateDTO templateDTO) {
-    final JsonResult<Boolean> result = new JsonResult<>();
+  public JsonResult<AlertTemplateDTO> checkTemplateText(@RequestBody AlertTemplateDTO templateDTO) {
+    final JsonResult<AlertTemplateDTO> result = new JsonResult<>();
 
     facadeTemplate.manage(result, new ManageCallback() {
       @Override
@@ -297,12 +298,19 @@ public void checkParameter() {
 
       @Override
       public void doManage() {
-        if (templateDTO.templateConfig == null
-            || StringUtils.isEmpty(templateDTO.templateConfig.text)) {
-          JsonResult.createSuccessResult(result, false);
+        NotificationTemplate template = templateDTO.getTemplateConfig();
+        if (template == null) {
+          result.setMessage("templateConfig is null");
           return;
         }
-        JsonResult.createSuccessResult(result, templateDTO.templateConfig.parseText());
+
+        if (StringUtils.isNotEmpty(template.text)) {
+          result.setSuccess(template.parseText());
+        } else if (!CollectionUtils.isEmpty(template.fieldMap)) {
+          template.text = template.getTemplateJson();
+          result.setSuccess(true);
+        }
+        result.setData(templateDTO);
       }
     });