From 99820789a34c8982ff95f3b1c36663d2475104f9 Mon Sep 17 00:00:00 2001 From: wzh425 Date: Sat, 11 Jan 2025 15:50:00 +0800 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=20refactor:=20Wasm=20support?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Masa.Alert.Service/Services/AlarmHistoryService.cs | 6 +++++- .../Masa.Alert.Service/Services/AlarmRuleRecordService.cs | 3 ++- .../Masa.Alert.Service/Services/AlarmRuleService.cs | 5 ++++- src/Services/Masa.Alert.Service/Services/WebHookService.cs | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Services/Masa.Alert.Service/Services/AlarmHistoryService.cs b/src/Services/Masa.Alert.Service/Services/AlarmHistoryService.cs index e6d6a6a2..885a2f9d 100644 --- a/src/Services/Masa.Alert.Service/Services/AlarmHistoryService.cs +++ b/src/Services/Masa.Alert.Service/Services/AlarmHistoryService.cs @@ -1,6 +1,9 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the Apache License. See LICENSE.txt in the project root for license information. +using Masa.Alert.Domain.Shared.AlarmHistory; +using Masa.Alert.Domain.Shared.AlarmRules; + namespace Masa.Alert.Service.Admin.Services; public class AlarmHistoryService : ServiceBase @@ -11,8 +14,9 @@ public AlarmHistoryService(IServiceCollection services) : base() } [RoutePattern("", StartWithBaseUri = true, HttpMethod = "Get")] - public async Task> GetListAsync(IEventBus eventbus, GetAlarmHistoryInputDto inputDto) + public async Task> GetListAsync(IEventBus eventbus, [FromQuery] Guid? alarmRuleId, [FromQuery] DateTime? startTime, [FromQuery] DateTime? endTime, [FromQuery] Guid? handler, [FromQuery] AlarmHistorySearchTypes searchType = default, [FromQuery] AlarmHistorySearchTimeTypes timeType = default, [FromQuery] AlertSeverity alertSeverity = default, [FromQuery] AlarmHistoryHandleStatuses handleStatus = default, [FromQuery] string filter = "", [FromQuery] string sorting = "", [FromQuery] int page = 1, [FromQuery] int pagesize = 10) { + var inputDto = new GetAlarmHistoryInputDto(filter, alarmRuleId, searchType, timeType, startTime, endTime, alertSeverity, handleStatus, handler ?? default, sorting, page, pagesize); var query = new GetAlarmHistoryListQuery(inputDto); await eventbus.PublishAsync(query); return query.Result; diff --git a/src/Services/Masa.Alert.Service/Services/AlarmRuleRecordService.cs b/src/Services/Masa.Alert.Service/Services/AlarmRuleRecordService.cs index e90bdda7..db2061f7 100644 --- a/src/Services/Masa.Alert.Service/Services/AlarmRuleRecordService.cs +++ b/src/Services/Masa.Alert.Service/Services/AlarmRuleRecordService.cs @@ -11,8 +11,9 @@ public AlarmRuleRecordService(IServiceCollection services) : base() } [RoutePattern("", StartWithBaseUri = true, HttpMethod = "Get")] - public async Task> GetListAsync(IEventBus eventbus, GetAlarmRuleRecordInputDto inputDto) + public async Task> GetListAsync(IEventBus eventbus, [FromQuery] Guid alarmHistoryId, [FromQuery] DateTime? startTime, [FromQuery] DateTime? endTime, [FromQuery] bool? isTrigger, [FromQuery] string sorting = "", [FromQuery] int page = 1, [FromQuery] int pagesize = 10) { + var inputDto = new GetAlarmRuleRecordInputDto(alarmHistoryId, startTime, endTime, isTrigger, sorting, page, pagesize); var query = new GetAlarmRuleRecordListQuery(inputDto); await eventbus.PublishAsync(query); return query.Result; diff --git a/src/Services/Masa.Alert.Service/Services/AlarmRuleService.cs b/src/Services/Masa.Alert.Service/Services/AlarmRuleService.cs index 382bcea8..8d221504 100644 --- a/src/Services/Masa.Alert.Service/Services/AlarmRuleService.cs +++ b/src/Services/Masa.Alert.Service/Services/AlarmRuleService.cs @@ -1,6 +1,8 @@ // Copyright (c) MASA Stack All rights reserved. // Licensed under the Apache License. See LICENSE.txt in the project root for license information. +using Masa.Alert.Domain.Shared.AlarmRules; + namespace Masa.Alert.Service.Admin.Services; public class AlarmRuleService : ServiceBase @@ -11,8 +13,9 @@ public AlarmRuleService(IServiceCollection services) : base() } [RoutePattern("", StartWithBaseUri = true, HttpMethod = "Get")] - public async Task> GetListAsync(IEventBus eventbus, GetAlarmRuleInputDto inputDto) + public async Task> GetListAsync(IEventBus eventbus, [FromQuery] DateTime? startTime, [FromQuery] DateTime? endTime, [FromQuery] AlarmRuleTypes type = default, [FromQuery] AlarmRuleSearchTimeTypes timeType = default, [FromQuery] string projectIdentity = "", [FromQuery] string appIdentity = "", [FromQuery] string metricId = "", [FromQuery] string filter = "", [FromQuery] string sorting = "", [FromQuery] int page = 1, [FromQuery] int pagesize = 10) { + var inputDto = new GetAlarmRuleInputDto(filter, type, timeType, startTime, endTime, projectIdentity, appIdentity, metricId, sorting, page, pagesize); var query = new GetAlarmRuleListQuery(inputDto); await eventbus.PublishAsync(query); return query.Result; diff --git a/src/Services/Masa.Alert.Service/Services/WebHookService.cs b/src/Services/Masa.Alert.Service/Services/WebHookService.cs index 1198a354..94a4a060 100644 --- a/src/Services/Masa.Alert.Service/Services/WebHookService.cs +++ b/src/Services/Masa.Alert.Service/Services/WebHookService.cs @@ -11,8 +11,9 @@ public WebHookService(IServiceCollection services) : base() } [RoutePattern("", StartWithBaseUri = true, HttpMethod = "Get")] - public async Task> GetListAsync(IEventBus eventbus, GetWebHookInputDto inputDto) + public async Task> GetListAsync(IEventBus eventbus, [FromQuery] string filter = "", [FromQuery] string sorting = "", [FromQuery] int page = 1, [FromQuery] int pagesize = 10) { + var inputDto = new GetWebHookInputDto(filter, sorting, page, pagesize); var query = new GetWebHookListQuery(inputDto); await eventbus.PublishAsync(query); return query.Result;