From 53723e87b62b0a0b0f2ed5bb00bb39fffcb396be Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Wed, 26 Mar 2025 10:02:42 +0800
Subject: [PATCH] =?UTF-8?q?chang-params:=E8=8E=B7=E5=8F=96=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E4=B8=BB=E4=BD=93=E5=85=A5=E5=8F=82keywords=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E4=B8=BAKpiName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/Warning/GetWarningRuleInput.cs                       | 4 ++--
 src/SJZY.Track.Application/Services/Warning/WarningService.cs | 2 +-
 .../Aggregates/WarningAggregate/IWarningRuleRepository.cs     | 2 +-
 .../Repositories/WarningRuleRepository.cs                     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs
index 8ec6831e..22dd71a9 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/GetWarningRuleInput.cs
@@ -11,9 +11,9 @@ public class GetWarningRuleInput
     public int? SubSystemId { get; set; }
 
     /// <summary>
-    /// 关键字(kpi名称 模糊查询)
+    /// kpi名称 模糊查询
     /// </summary>
-    public string? Keywords { get; set; }
+    public string? KpiName { get; set; }
 
     /// <summary>
     /// 客户id
diff --git a/src/SJZY.Track.Application/Services/Warning/WarningService.cs b/src/SJZY.Track.Application/Services/Warning/WarningService.cs
index ced9e491..695dbc6a 100644
--- a/src/SJZY.Track.Application/Services/Warning/WarningService.cs
+++ b/src/SJZY.Track.Application/Services/Warning/WarningService.cs
@@ -38,7 +38,7 @@ public class WarningService : ApplicationService
     [HttpPost("GetWarningRule")]
     public async Task<UnifyResultDto<List<WarningRuleDto>>> GetWarningRule(GetWarningRuleInput input)
     {
-        var result = await _warningRuleRepository.GetWarningRuleListAsync(input.SubSystemId, input.CustomId, input.Keywords, input.IsEnabled, input.WarningType);
+        var result = await _warningRuleRepository.GetWarningRuleListAsync(input.SubSystemId, input.CustomId, input.KpiName, input.IsEnabled, input.WarningType);
         if (result.Count == 0)
             return new UnifyResultDto<List<WarningRuleDto>>(true, new List<WarningRuleDto>());
 
diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningRuleRepository.cs b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningRuleRepository.cs
index b137a06c..b9eb6b41 100644
--- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningRuleRepository.cs
+++ b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/IWarningRuleRepository.cs
@@ -25,7 +25,7 @@ public interface IWarningRuleRepository : IBasicRepository<WarningRuleEntity>
     Task<string> UpdateVersionAsync(WarningRuleEntity entity);
 
     // 模糊查询预警规则主体
-    Task<List<WarningRuleEntity>> GetWarningRuleListAsync(int? subsystemId, int? customId, string? keyword, bool? isEnabled, int? warningType);
+    Task<List<WarningRuleEntity>> GetWarningRuleListAsync(int? subsystemId, int? customId, string? kpiname, bool? isEnabled, int? warningType);
 
     // 获取启用的预警规则主体
     Task<WarningRuleEntity?> GetWarningRuleForEnabledAsync(int subSystemId, int customId, WarningRuleType warningType);
diff --git a/src/SJZY.Track.Repository/Repositories/WarningRuleRepository.cs b/src/SJZY.Track.Repository/Repositories/WarningRuleRepository.cs
index 811dbe8e..a6aa0b68 100644
--- a/src/SJZY.Track.Repository/Repositories/WarningRuleRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/WarningRuleRepository.cs
@@ -76,14 +76,14 @@ public class WarningRuleRepository : BasicRepository<WarningRuleEntity>, IWarnin
         return version;
     }
 
-    public Task<List<WarningRuleEntity>> GetWarningRuleListAsync(int? subsystemId, int? customId, string? keywords, bool? isEnabled, int? warningType)
+    public Task<List<WarningRuleEntity>> GetWarningRuleListAsync(int? subsystemId, int? customId, string? kpiname, bool? isEnabled, int? warningType)
     {
         return Context.Queryable<WarningRuleEntity>()
             .WhereIF(customId.HasValue, x => x.CustomId == customId!.Value)
             .WhereIF(subsystemId.HasValue, x => x.SubSystemId == subsystemId!.Value)
             .WhereIF(warningType.HasValue, x => x.WarningType == warningType!.Value)
             .WhereIF(isEnabled.HasValue, x => x.IsEnabled == isEnabled!.Value)
-            .WhereIF(!string.IsNullOrWhiteSpace(keywords), x => x.Name.Contains(keywords!))
+            .WhereIF(!string.IsNullOrWhiteSpace(kpiname), x => x.Name.Contains(kpiname!))
             .ToListAsync();
     }