apache · tomsun28 · Oct 26, 2023 · Oct 24, 2023 · Oct 24, 2023 · Oct 24, 2023
diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergesController.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertConvergesController.java
@@ -29,6 +29,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.persistence.criteria.CriteriaBuilder;
@@ -58,6 +59,7 @@ public class AlertConvergesController {
             description = "You can obtain the list of alarm converge by querying filter items ｜ 根据查询过滤项获取告警收敛信息列表")
     public ResponseEntity<Message<Page<AlertConverge>>> getAlertConverges(
             @Parameter(description = "Alarm Converge ID ｜ 告警收敛ID", example = "6565463543") @RequestParam(required = false) List<Long> ids,
+            @Parameter(description = "Search Name ｜ 模糊查询-名称", example = "x") @RequestParam(required = false) String search,
             @Parameter(description = "Sort field, default id ｜ 排序字段，默认id", example = "id") @RequestParam(defaultValue = "id") String sort,
             @Parameter(description = "Sort mode: asc: ascending, desc: descending ｜ 排序方式，asc:升序，desc:降序", example = "desc") @RequestParam(defaultValue = "desc") String order,
             @Parameter(description = "List current page ｜ 列表当前分页", example = "0") @RequestParam(defaultValue = "0") int pageIndex,
@@ -72,6 +74,15 @@ public ResponseEntity<Message<Page<AlertConverge>>> getAlertConverges(
                 }
                 andList.add(inPredicate);
             }
+            if (StringUtils.hasText(search)) {
+                Predicate predicate = criteriaBuilder.or(
+                        criteriaBuilder.like(
+                                criteriaBuilder.lower(root.get("name")),
+                                "%" + search.toLowerCase() + "%"
+                        )
+                );
+                andList.add(predicate);
+            }
             Predicate[] predicates = new Predicate[andList.size()];
             return criteriaBuilder.and(andList.toArray(predicates));
         };

diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertDefinesController.java
@@ -63,7 +63,7 @@ public class AlertDefinesController {
             description = "You can obtain the list of alarm definitions by querying filter items ｜ 根据查询过滤项获取告警定义信息列表")
     public ResponseEntity<Message<Page<AlertDefine>>> getAlertDefines(
             @Parameter(description = "Alarm Definition ID ｜ 告警定义ID", example = "6565463543") @RequestParam(required = false) List<Long> ids,
-            @Parameter(description = "Alarm Definition app ｜ 告警定义名称", example = "6565463543") @RequestParam(required = false) String search,
+            @Parameter(description = "Search-Target Expr Template ｜ 模糊查询-指标对象 表达式 通知模版", example = "x") @RequestParam(required = false) String search,
             @Parameter(description = "Alarm Definition Severity ｜ 告警定义级别", example = "6565463543") @RequestParam(required = false) Byte priority,
             @Parameter(description = "Sort field, default id ｜ 排序字段，默认id", example = "id") @RequestParam(defaultValue = "id") String sort,
             @Parameter(description = "Sort mode: asc: ascending, desc: descending ｜ 排序方式，asc:升序，desc:降序", example = "desc") @RequestParam(defaultValue = "desc") String order,
@@ -87,11 +87,19 @@ public ResponseEntity<Message<Page<AlertDefine>>> getAlertDefines(
                         ),
                         criteriaBuilder.like(
                                 criteriaBuilder.lower(root.get("metric")),
-                                "%" + search.toUpperCase() + "%"
+                                "%" + search.toLowerCase() + "%"
                         ),
                         criteriaBuilder.like(
                                 criteriaBuilder.lower(root.get("field")),
-                                "%" + search.toUpperCase() + "%"
+                                "%" + search.toLowerCase() + "%"
+                        ),
+                        criteriaBuilder.like(
+                                criteriaBuilder.lower(root.get("expr")),
+                                "%" + search.toLowerCase() + "%"
+                        ),
+                        criteriaBuilder.like(
+                                criteriaBuilder.lower(root.get("template")),
+                                "%" + search.toLowerCase() + "%"
                         )
                 );
                 andList.add(predicate);

diff --git a/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilencesController.java b/alerter/src/main/java/org/dromara/hertzbeat/alert/controller/AlertSilencesController.java
@@ -29,6 +29,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.persistence.criteria.CriteriaBuilder;
@@ -58,6 +59,7 @@ public class AlertSilencesController {
             description = "You can obtain the list of alarm silence by querying filter items ｜ 根据查询过滤项获取告警静默信息列表")
     public ResponseEntity<Message<Page<AlertSilence>>> getAlertSilences(
             @Parameter(description = "Alarm Silence ID ｜ 告警静默ID", example = "6565463543") @RequestParam(required = false) List<Long> ids,
+            @Parameter(description = "Search Name ｜ 模糊查询-名称", example = "x") @RequestParam(required = false) String search,
             @Parameter(description = "Sort field, default id ｜ 排序字段，默认id", example = "id") @RequestParam(defaultValue = "id") String sort,
             @Parameter(description = "Sort mode: asc: ascending, desc: descending ｜ 排序方式，asc:升序，desc:降序", example = "desc") @RequestParam(defaultValue = "desc") String order,
             @Parameter(description = "List current page ｜ 列表当前分页", example = "0") @RequestParam(defaultValue = "0") int pageIndex,
@@ -72,6 +74,15 @@ public ResponseEntity<Message<Page<AlertSilence>>> getAlertSilences(
                 }
                 andList.add(inPredicate);
             }
+            if (StringUtils.hasText(search)) {
+                Predicate predicate = criteriaBuilder.or(
+                        criteriaBuilder.like(
+                                criteriaBuilder.lower(root.get("name")),
+                                "%" + search.toLowerCase() + "%"
+                        )
+                );
+                andList.add(predicate);
+            }
             Predicate[] predicates = new Predicate[andList.size()];
             return criteriaBuilder.and(andList.toArray(predicates));
         };

diff --git a/...main/resources/templates/0-mailAlarm.html → .../resources/templates/1-emailTemplate.html b/...main/resources/templates/0-mailAlarm.html → .../resources/templates/1-emailTemplate.html
diff --git a/...ces/templates/10-alertNotifyWeWorkApp.txt → ...ources/templates/10-weWorkAppTemplate.txt b/...ces/templates/10-alertNotifyWeWorkApp.txt → ...ources/templates/10-weWorkAppTemplate.txt
diff --git a/...resources/templates/11-alertNotifySmn.txt → ...in/resources/templates/11-smnTemplate.txt b/...resources/templates/11-alertNotifySmn.txt → ...in/resources/templates/11-smnTemplate.txt
diff --git a/...es/templates/12-alertNotifyServerChan.txt → ...urces/templates/12-serverChanTemplate.txt b/...es/templates/12-alertNotifyServerChan.txt → ...urces/templates/12-serverChanTemplate.txt
diff --git a/...es/templates/4-alertNotifyWeWorkRobot.txt → ...urces/templates/4-weWorkRobotTemplate.txt b/...es/templates/4-alertNotifyWeWorkRobot.txt → ...urces/templates/4-weWorkRobotTemplate.txt
diff --git a/.../templates/5-alertNotifyDingTalkRobot.txt → ...ces/templates/5-dingTalkRobotTemplate.txt b/.../templates/5-alertNotifyDingTalkRobot.txt → ...ces/templates/5-dingTalkRobotTemplate.txt
diff --git a/...ources/templates/6-alertNotifyFlyBook.txt → ...rces/templates/6-flyBookRobotTemplate.txt b/...ources/templates/6-alertNotifyFlyBook.txt → ...rces/templates/6-flyBookRobotTemplate.txt
diff --git a/...es/templates/7-alertNotifyTelegramBot.txt → ...urces/templates/7-telegramBotTemplate.txt b/...es/templates/7-alertNotifyTelegramBot.txt → ...urces/templates/7-telegramBotTemplate.txt
diff --git a/...esources/templates/8-alertNotifySlack.txt → ...n/resources/templates/8-slackTemplate.txt b/...esources/templates/8-alertNotifySlack.txt → ...n/resources/templates/8-slackTemplate.txt
diff --git a/...ces/templates/9-alertNotifyDiscordBot.txt → ...ources/templates/9-discordBotTemplate.txt b/...ces/templates/9-alertNotifyDiscordBot.txt → ...ources/templates/9-discordBotTemplate.txt
diff --git a/web-app/src/app/core/startup/startup.service.ts b/web-app/src/app/core/startup/startup.service.ts
@@ -60,7 +60,7 @@ export class StartupService {
         // Application information: including site name, description, year
         this.settingService.setApp(appData.app);
         // https://ng-alain.com/theme/settings/zh
-        this.settingService.setLayout('collapsed', true);
+        // this.settingService.setLayout('collapsed', true);
         // ACL: Set the permissions to full, https://ng-alain.com/acl/getting-started
         this.aclService.setFull(true);
         // Menu data, https://ng-alain.com/theme/menu

diff --git a/web-app/src/app/layout/basic/widgets/user.component.ts b/web-app/src/app/layout/basic/widgets/user.component.ts
@@ -34,7 +34,7 @@ import { CONSTANTS } from '../../../shared/constants';
       [nzFooter]="null"
       (nzOnCancel)="disAboutModal()"
       nzClosable="false"
-      nzWidth="44%"
+      nzWidth="48%"
     >
       <div *nzModalContent class="-inner-content">
         <div style="text-align: center">

diff --git a/web-app/src/app/pojo/NoticeRule.ts b/web-app/src/app/pojo/NoticeRule.ts
@@ -3,8 +3,8 @@ export class NoticeRule {
   name!: string;
   receiverId!: number;
   receiverName!: string;
-  templateId!: number;
-  templateName!: string;
+  templateId!: number | null;
+  templateName!: string | null;
   enable: boolean = true;
   // 是否转发所有
   filterAll: boolean = true;

diff --git a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
@@ -17,6 +17,18 @@
     <i nz-icon nzType="delete" nzTheme="outline"></i>
     {{ 'alert.converge.delete' | i18n }}
   </button>
+  <button style="margin-right: 25px; float: right" nz-button nzType="primary" (click)="loadAlertConvergeTable()">
+    {{ 'common.search' | i18n }}
+  </button>
+  <input
+    style="margin-right: 5px; float: right; width: 200px; border-radius: 9px; text-align: center; margin-right: 0"
+    nz-input
+    type="text"
+    [placeholder]="'alert.converge.name' | i18n"
+    nzSize="default"
+    (keyup.enter)="loadAlertConvergeTable()"
+    [(ngModel)]="search"
+  />
 </div>
 
 <nz-table

diff --git a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.ts b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.ts
@@ -29,6 +29,7 @@ export class AlertConvergeComponent implements OnInit {
   pageIndex: number = 1;
   pageSize: number = 8;
   total: number = 0;
+  search!: string;
   converges!: AlertConverge[];
   tableLoading: boolean = true;
   checkedConvergeIds = new Set<number>();
@@ -43,7 +44,7 @@ export class AlertConvergeComponent implements OnInit {
 
   loadAlertConvergeTable() {
     this.tableLoading = true;
-    let alertDefineInit$ = this.alertConvergeService.getAlertConverges(this.pageIndex - 1, this.pageSize).subscribe(
+    let alertDefineInit$ = this.alertConvergeService.getAlertConverges(this.search, this.pageIndex - 1, this.pageSize).subscribe(
       message => {
         this.tableLoading = false;
         this.checkedAll = false;