From d8929fb41fc53b2576b134010b23a85d00f64abb Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Thu, 6 Mar 2025 14:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AE=8C=E6=95=B4=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E6=98=8E=E7=BB=86=E5=8F=8D=E5=8F=82=20=20-=20?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E8=BD=A8=E8=BF=B9=E7=8A=B6=E6=80=81=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAid+=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Complete/CompleteWarningDetailsDto.cs       |  6 ++++--
 .../Services/Warning/CompleteWarningService.cs  | 17 +++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs
index b2c0d5be..94fafb32 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs
@@ -1,7 +1,9 @@
+using SJZY.Track.Application.Contract.Dtos.Warning.Return;
+
 namespace SJZY.Track.Application.Contract.Dtos.Warning.Complete;
 
 /// <summary>
-/// 完整预警
+/// 完整预警明细
 /// </summary>
 public class CompleteWarningDetailsDto
 {
@@ -59,7 +61,7 @@ public class CompleteWarningDetailsDto
 	/// <summary>
 	/// 缺失轨迹状态
 	/// </summary>
-	public string MissingTrackStatus { get; set; } // todo:id换名称
+	public List<TrackStatusDto> MissingTrackStatus { get; set; }
 
 
 	//视图属性 tips:从es即时拿取
diff --git a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs b/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs
index 2a52edbf..06b4c97f 100644
--- a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs
+++ b/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs
@@ -194,18 +194,23 @@ public class CompleteWarningService : ApplicationService
             return string.Join(',', notifyUsers.ToObject<List<NotifyUserDto>>().Select(x => x.UserName));
         }
 
-        string BuildMissingTrackStatus(string statusIds)
+        List<TrackStatusDto> BuildMissingTrackStatus(string statusIds)
         {
             var trackStatus = statusIds.Split(',').Select(x =>
             {
-                if (int.TryParse(x, out var id))
-                    return trackStatusDict.GetValueOrDefault(id)
-                           ?? $"丢失{id}轨迹状态";
+                if (!int.TryParse(x, out var id)) return null;
+
+                var trackStatusName = trackStatusDict.GetValueOrDefault(id);
+                if (string.IsNullOrWhiteSpace(trackStatusName)) return null;
+                return new TrackStatusDto
+                {
+                    TrackStatusId = id,
+                    TrackStatus = trackStatusName
+                };
 
-                return null;
             }).Where(x => x != null);
 
-            return string.Join(',', trackStatus);
+            return trackStatus.ToList()!;
         }
     }