Merge branch 'S07' into test

This commit is contained in:
hardstylewyl 2025-04-10 11:57:49 +08:00
commit 2119bdaa12

View File

@ -1,6 +1,7 @@
using Nest; using Nest;
using SJZY.Expand.ElasticSearch; using SJZY.Expand.ElasticSearch;
using SJZY.Track.Domain.Consts; using SJZY.Track.Domain.Consts;
using SJZY.Track.Domain.Extensions;
namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Complete; namespace SJZY.Track.Domain.Aggregates.WarningAggregate.Complete;
@ -15,7 +16,7 @@ public sealed class CompleteWarningDetailsIndex : IdBaseIndex
//public string NotifyModes { get; set; } //通知方式,多个方式(,)分割 eg: 1,2 //public string NotifyModes { get; set; } //通知方式,多个方式(,)分割 eg: 1,2
public string NotifyUsers { get; set; } //通知人Json eg: [{"UserId":1,"UserName":"张三"},{"UserId":2,"UserName":"李四"}] public string NotifyUsers { get; set; } //通知人Json eg: [{"UserId":1,"UserName":"张三"},{"UserId":2,"UserName":"李四"}]
public int CheckPointTrackStatusId { get; set; } // (冗余)检查点轨迹状态Id public int CheckPointTrackStatusId { get; set; } // (冗余)检查点轨迹状态Id
public string MissingTrackStatusIds { get; set; } //(冗余)缺失的轨迹状态表达式 public string? MissingTrackStatusIds { get; set; } //(冗余)缺失的轨迹状态表达式
//订单信息 //订单信息
public int SubSystemId { get; set; } //(冗余)子系统Id public int SubSystemId { get; set; } //(冗余)子系统Id
@ -45,6 +46,8 @@ public sealed class CompleteWarningDetailsIndex : IdBaseIndex
public List<HashSet<int>> GetMissingTrackStatusIdGroups() public List<HashSet<int>> GetMissingTrackStatusIdGroups()
{ {
if (string.IsNullOrWhiteSpace(MissingTrackStatusIds)) return Empty<HashSet<int>>.List;
return MissingTrackStatusIds return MissingTrackStatusIds
.Split(",") .Split(",")
.Select(g => g.Split('/').Select(int.Parse).ToHashSet()) .Select(g => g.Split('/').Select(int.Parse).ToHashSet())