fix: 日志查询开始时间和结束时间校验

apm 日期显示错误修复
masastack · Apr 29, 2024 · 91bc596 · 91bc596
1 parent 18d6f2a
commit 91bc596
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/Services/Masa.Tsc.Service.Admin/Application/Logs/QueryHandler.cs b/src/Services/Masa.Tsc.Service.Admin/Application/Logs/QueryHandler.cs
@@ -16,6 +16,10 @@ public QueryHandler(ILogService logService, IMasaStackConfig masaStackConfig, IW
     [EventHandler]
     public async Task AggregateAsync(LogAggQuery query)
     {
+        if (query.Data.End < query.Data.Start)
+        {
+            (query.Data.End, query.Data.Start) = (query.Data.Start, query.Data.End);
+        }
         query.Data.SetValues();
         query.Data.SetEnv(GetServiceEnvironmentName(query.Data.Service));
         query.Result = await _logService.AggregateAsync(query.Data);
@@ -33,6 +37,10 @@ public async Task GetLatestDataAsync(LatestLogQuery queryData)
             PageSize = 1,
             Sort = new FieldOrderDto { Name = StorageConst.Timestimap(ConfigConst.IsElasticsearch, ConfigConst.IsClickhouse), IsDesc = !queryData.IsDesc }
         };
+        if (query.End < query.Start)
+        {
+            (query.End, query.Start) = (query.Start, query.End);
+        }
 
         var env = GetServiceEnvironmentName(string.Empty!);
         query.SetEnv(env);
@@ -102,7 +110,7 @@ public async Task GetPageListAsync(LogsQuery queryData)
             if (queryData.IsLimitEnv)
             {
                 env = GetServiceEnvironmentName(queryData.Service!);
-            }            
+            }
             if (!string.IsNullOrEmpty(env))
                 query.SetEnv(env, queryData.IsLimitEnv);
         }

diff --git a/src/Web/Masa.Tsc.Web.Admin.Rcl/Shared/ApmComponentBase.cs b/src/Web/Masa.Tsc.Web.Admin.Rcl/Shared/ApmComponentBase.cs
@@ -49,8 +49,8 @@ protected override void OnInitialized()
             var end = values.Get("end");
             if (DateTime.TryParse(start, out DateTime startTime) && DateTime.TryParse(end, out DateTime endTime) && endTime > startTime)
             {
-                Search.Start = startTime;
-                Search.End = endTime;
+                Search.Start = startTime.ToDateTimeOffset(default).UtcDateTime;
+                Search.End = endTime.ToDateTimeOffset(default).UtcDateTime;
             }
             var service = values.Get("service");
             var env = values.Get("env");
@@ -98,7 +98,7 @@ protected override void OnInitialized()
         base.OnInitialized();
     }
 
-    public static string GetUrlParam(string? service = default,
+    public string GetUrlParam(string? service = default,
          string? env = default,
          string? endpoint = default,
          DateTime? start = default,
@@ -120,7 +120,7 @@ public static string GetUrlParam(string? service = default,
         if (comparisonType.HasValue)
             text.AppendFormat("&comparison={0}", (int)comparisonType);
         if (start.HasValue && start.Value > DateTime.MinValue)
-            text.AppendFormat("&start={0:yyyy-MM-dd HH:mm:ss}", HttpUtility.UrlEncode(start.Value.ToString("yyyy-MM-dd HH:mm:ss")));
+            text.AppendFormat("&start={0}", HttpUtility.UrlEncode(start.Value.ToString("yyyy-MM-dd HH:mm:ss")));
         if (end.HasValue && end.Value > DateTime.MinValue)
             text.AppendFormat("&end={0}", HttpUtility.UrlEncode(end.Value.ToString("yyyy-MM-dd HH:mm:ss")));
         if (!string.IsNullOrEmpty(exType))