From 5fa8822e06e8f25d8b5bde09bf219e307f4c582a Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Wed, 26 Mar 2025 15:08:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?change-params:=E8=8E=B7=E5=8F=96=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E9=A2=84=E8=AD=A6=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E8=BD=A8=E8=BF=B9=E5=8F=82=E6=95=B0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Complete/CompleteWarningDetailsDto.cs | 4 ++-- .../Warning/CompleteWarningService.cs | 22 +++++-------------- .../Complete/CompleteWarningDetailsIndex.cs | 8 +++++++ 3 files changed, 16 insertions(+), 18 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 f4e14d89..39285568 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs @@ -59,9 +59,9 @@ public class CompleteWarningDetailsDto public string CustomName { get; set; } /// - /// 缺失轨迹状态 + /// 缺失轨迹状态 e.g [ {1:"状态1",2:"状态2"} , {3:"状态3",4:"状态4"} ] /// - public List MissingTrackStatus { get; set; } + public List> 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 e956fd80..aed5db94 100644 --- a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs +++ b/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs @@ -1,3 +1,4 @@ +using Nest; using SJZY.Expand.ABP.Core.PublicMethords; using SJZY.Track.Application.Contract.Dtos.Warning; using SJZY.Track.Application.Contract.Dtos.Warning.Complete; @@ -180,7 +181,7 @@ public class CompleteWarningService : ApplicationService Status = x.Status, CustomId = x.CustomId, CustomName = customDict.GetValueOrDefault(x.CustomId, GlobalConst.EmptyString), - MissingTrackStatus = BuildMissingTrackStatus(x.MissingTrackStatusIds), + MissingTrackStatus = BuildMissingTrackStatus(x), LatestTrackStatus = orderIdTrack?.TrackStatus, LatestTrackContent = orderIdTrack?.TrackContent, LatestTrackPlace = orderIdTrack?.TrackPlace, @@ -213,22 +214,11 @@ public class CompleteWarningService : ApplicationService } // 构建缺失轨迹状态 - List BuildMissingTrackStatus(string statusIds) + List> BuildMissingTrackStatus(CompleteWarningDetailsIndex detail) { - var trackStatus = statusIds.Split(',').Select(x => - { - 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 - }; - }).Where(x => x != null); - - return trackStatus.ToList()!; + return detail.GetMissingTrackStatusIdGroups() + .Select(g => g.ToDictionary(id => id.ToString(), id => trackStatusDict.GetValueOrDefault(id, GlobalConst.EmptyString))) + .ToList(); } // 格式化时区 diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningDetailsIndex.cs index 1a915873..bf529ce9 100644 --- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningDetailsIndex.cs +++ b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Complete/CompleteWarningDetailsIndex.cs @@ -42,4 +42,12 @@ public sealed class CompleteWarningDetailsIndex : IdBaseIndex //审计属性 public DateTime CreateTime { get; set; } // 预警创建时间 public DateTime? ProcessedTime { get; set; } // 预警处理时间 + + public List> GetMissingTrackStatusIdGroups() + { + return MissingTrackStatusIds + .Split(",") + .Select(g => g.Split('/').Select(int.Parse).ToHashSet()) + .ToList(); + } } From c82aab9dd467089f73221e1bfc18944e929507fa Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Wed, 26 Mar 2025 15:15:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?change-params:=E8=8E=B7=E5=8F=96=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E9=A2=84=E8=AD=A6=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E8=BD=A8=E8=BF=B9=E5=8F=82=E6=95=B0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9B=B4=E6=94=B9V2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Warning/Complete/CompleteWarningDetailsDto.cs | 2 +- .../Services/Warning/CompleteWarningService.cs | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 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 39285568..ec2c9802 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs @@ -61,7 +61,7 @@ public class CompleteWarningDetailsDto /// /// 缺失轨迹状态 e.g [ {1:"状态1",2:"状态2"} , {3:"状态3",4:"状态4"} ] /// - public List> MissingTrackStatus { get; set; } + public List 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 aed5db94..43162cde 100644 --- a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs +++ b/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs @@ -214,11 +214,20 @@ public class CompleteWarningService : ApplicationService } // 构建缺失轨迹状态 - List> BuildMissingTrackStatus(CompleteWarningDetailsIndex detail) + List BuildMissingTrackStatus(CompleteWarningDetailsIndex detail) { + // return detail.GetMissingTrackStatusIdGroups() + // .Select(g => g.ToDictionary(id => id.ToString(), id => trackStatusDict.GetValueOrDefault(id, GlobalConst.EmptyString))) + // .ToList(); return detail.GetMissingTrackStatusIdGroups() - .Select(g => g.ToDictionary(id => id.ToString(), id => trackStatusDict.GetValueOrDefault(id, GlobalConst.EmptyString))) - .ToList(); + .Select(g => new RequireTrackStatusItem + { + Statuses = g.Select(id => new TrackStatusDto + { + TrackStatusId = id, + TrackStatus = trackStatusDict.GetValueOrDefault(id, GlobalConst.EmptyString) + }).ToList() + }).ToList(); } // 格式化时区