From 78cfd9c083a13513b3a1117e34b1359ee85f5574 Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Thu, 27 Mar 2025 15:21:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E8=A7=84=E5=88=99=E9=A1=B9=E7=9B=AE=E5=9C=A8=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=A2=9E=E6=97=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E6=88=90=E5=8A=9F=20option?= =?UTF-8?q?:=E9=A2=84=E8=AD=A6=E9=80=9A=E7=9F=A5IsNeedToHandle=E6=94=B9?= =?UTF-8?q?=E4=B8=BAfalse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Hangfire/NotifyConfig.cs | 2 +- .../Handlers/CompleteWarningHandler.cs | 52 ++++++++++++------- .../Warning/Handlers/ReturnWarningHandler.cs | 40 +++++++++----- .../Handlers/TransportWarningHandler.cs | 52 ++++++++++++------- 4 files changed, 92 insertions(+), 54 deletions(-) diff --git a/src/SJZY.Track.Application/Hangfire/NotifyConfig.cs b/src/SJZY.Track.Application/Hangfire/NotifyConfig.cs index 53a3327e..dfcca489 100644 --- a/src/SJZY.Track.Application/Hangfire/NotifyConfig.cs +++ b/src/SJZY.Track.Application/Hangfire/NotifyConfig.cs @@ -7,7 +7,7 @@ public class NotifyConfig { private const string ContentKey = "content"; //内容参数 - public bool IsNeedToHandle { get; set; } = true; //是否需要处理(默认为未处理,传false为无需处理,针对站内信是否处理功能) + public bool IsNeedToHandle { get; set; } = false; //是否需要处理(默认为未处理,传false为无需处理,针对站内信是否处理功能) public int MsgSource { get; set; } // 消息来源：1.消息 2.任务 3.流程 4.消息提醒 public int SystemId { get; set; } = 9498; //子系统id 业务中台 public string TemplateCode { get; set; } = "TrackWarningNotify"; //模板code diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs index 54709b52..b9a60249 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/CompleteWarningHandler.cs @@ -269,8 +269,9 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient return; } - // 关心规则修改/删除 + // 修改/关注/删除 var updateRuleItems = new List(); + var followRuleItems = new List(); var deleteRuleItems = new List(); // 构建id配置项字典 @@ -288,20 +289,24 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient var postRule = postDict.GetValueOrDefault(ruleItemId); if (oldRule != null && postRule != null) { - //规则属性变更,(状态减少，时效变更) - if (CanNeedFollow(oldRule, postRule)) - updateRuleItems.Add(postRule); //更新 关注新配置 + // 规则属性变更关注(状态减少，时效变更) + var (follow, change) = CanNeedFollowAndChange(oldRule, postRule); + if (follow) followRuleItems.Add(postRule); //需要关注的 + if (change) updateRuleItems.Add(postRule); //更新 continue; } - //规则条目被删除 + // 规则条目被删除 if (oldRule != null && postRule == null) - deleteRuleItems.Add(oldRule); //删除 关注旧配置 + { + followRuleItems.Add(oldRule); //删除一定需要关注 + deleteRuleItems.Add(oldRule); //删除 + } } // 3.处理变更 - await HandleRuleItemsChangeAsync(rule, addRuleItems, updateRuleItems, deleteRuleItems); + await HandleRuleItemsChangeAsync(rule, addRuleItems, updateRuleItems, followRuleItems, deleteRuleItems); } private async Task OnlyDeleteHandleAsync(WarningRuleEntity rule, List bos) @@ -329,11 +334,11 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient WarningRuleEntity rule, List addRuleItems, List updateRuleItems, + List followRuleItems, List deleteRuleItems ) { - var ruleItemIds = new HashSet(updateRuleItems.Count + deleteRuleItems.Count); - // 新增/修改/删除 实体，稍后做处理 + // 新增/修改/关注/删除 实体，稍后做处理 if (addRuleItems.Count > 0) { var addEntities = CompleteWarningRuleItemBO.ToEntities(addRuleItems); @@ -344,39 +349,44 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient { var updateEntities = CompleteWarningRuleItemBO.ToEntities(updateRuleItems); await _warningRuleRepository.BulkUpdateCompleteRuleItemsAsync(updateEntities); - ruleItemIds.UnionWith(updateEntities.Select(x => x.Id)); } + // 删除规则条目是必须要关注 if (deleteRuleItems.Count > 0) { var deleteRuleItemIds = deleteRuleItems.Select(x => x.Id).ToHashSet(); await _warningRuleRepository.DeleteCompleteRuleItemsAsync(deleteRuleItemIds); - ruleItemIds.UnionWith(deleteRuleItemIds); } // 更新规则主体版本号 await _warningRuleRepository.UpdateVersionAsync(rule); - if (ruleItemIds.Count == 0) return; + if (followRuleItems.Count == 0) return; // 关闭预警规则关联的所有信息（包含明细,通知任务） + var ruleItemIds = followRuleItems.Select(x => x.Id).ToHashSet(); await CloseWarningRuleLinkAsync(ruleItemIds); } - private static bool CanNeedFollow(CompleteWarningRuleItemBO oldRule, CompleteWarningRuleItemBO postRule) + private static (bool follow, bool change) CanNeedFollowAndChange(CompleteWarningRuleItemBO oldRule, CompleteWarningRuleItemBO postRule) { + var defaultResult = (true, true); // 关注的订单类型减少 var oldTypes = oldRule.OrderTypes; var postTypes = postRule.OrderTypes; + + if (oldTypes.Count > postTypes.Count) //数量减少，一定需要关注 + return defaultResult; + foreach (var type in oldTypes) { - if (!postTypes.Contains(type)) - return true; + if (!postTypes.Contains(type)) //类型减少，需要关注 + return defaultResult; } // 检查点发生变化 if (oldRule.CheckPointTrackStatusId != postRule.CheckPointTrackStatusId) - return true; + return defaultResult; // 要求的轨迹状态， // 条目内或关系状态变更，比如 案例1：S1/S2,S4 => S1/S3,案例2： S1/S2,S4 => S1,S4 @@ -385,15 +395,19 @@ public sealed class CompleteWarningHandler : ICompleteWarningHandler, ITransient var postStatusIds = postRule.RequireTrackStatus.SelectMany(x => x).ToHashSet(); if (oldStatusIds.Count > postStatusIds.Count) //数量减少，一定需要关注 - return true; + return defaultResult; foreach (var statusId in oldStatusIds) { if (!postStatusIds.Contains(statusId)) //状态减少，需要关注 - return true; + return defaultResult; } - return false; + // 通知对象 + var oldNotifyUserIds = oldRule.NotifyUsers.Select(x => x.UserId).ToHashSet(); + var postNotifyUserIds = oldRule.NotifyUsers.Select(x => x.UserId).ToHashSet(); + var hasChange = !oldTypes.SetEquals(postTypes) || !oldStatusIds.SetEquals(postStatusIds) || !oldNotifyUserIds.SetEquals(postNotifyUserIds); + return (false, hasChange); } #endregion todo: 规则项目变更 diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs index 4e06decd..476d4a36 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/ReturnWarningHandler.cs @@ -504,8 +504,9 @@ public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDepe return; } - // 关心规则修改/删除 + // 修改/关注/删除 var updateRuleItems = new List(); + var followRuleItems = new List(); var deleteRuleItems = new List(); // 2.差异化比较 @@ -522,18 +523,22 @@ public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDepe if (oldRule != null && postRule != null) { //规则属性变更,(状态减少，时效变更) - if (CanNeedFollow(oldRule, postRule)) - updateRuleItems.Add(postRule); + var (follow, change) = CanNeedFollowAndChange(oldRule, postRule); + if (follow) followRuleItems.Add(postRule); //更新需要关注的 + if (change) updateRuleItems.Add(postRule); //更新 continue; } //规则条目被删除 if (oldRule != null && postRule == null) - deleteRuleItems.Add(oldRule); + { + followRuleItems.Add(oldRule); //删除一定需要关注 + deleteRuleItems.Add(oldRule); //删除 + } } // 3.处理变更 - await HandleRuleItemsChangeAsync(rule, addRuleItems, updateRuleItems, deleteRuleItems); + await HandleRuleItemsChangeAsync(rule, addRuleItems, updateRuleItems, followRuleItems, deleteRuleItems); } private async Task OnlyAddHandleAsync(WarningRuleEntity rule, List bos) @@ -560,9 +565,9 @@ public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDepe private async Task HandleRuleItemsChangeAsync(WarningRuleEntity rule, List addRuleItems, List updateRuleItems, + List followRuleItems, List deleteRuleItems) { - var ruleItemIds = new HashSet(updateRuleItems.Count + deleteRuleItems.Count); // 1.新增/修改/删除规则，稍后做处理 if (addRuleItems.Count > 0) { @@ -574,39 +579,46 @@ public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDepe { var updateEntities = ReturnWarningRuleItemBO.ToEntities(updateRuleItems); await _warningRuleRepository.BulkUpdateReturnRuleItemsAsync(updateEntities); - ruleItemIds.UnionWith(updateEntities.Select(x => x.Id)); } if (deleteRuleItems.Count > 0) { var deleteRuleItemIds = deleteRuleItems.Select(x => x.Id).ToHashSet(); await _warningRuleRepository.DeleteReturnRuleItemsAsync(deleteRuleItemIds); - ruleItemIds.UnionWith(deleteRuleItemIds); } // 更新规则主体版本号 await _warningRuleRepository.UpdateVersionAsync(rule); - if (ruleItemIds.Count == 0) return; + if (followRuleItems.Count == 0) return; // 2.关闭预警规则关联的所有信息（包含明细,重试任务,通知任务） + var ruleItemIds = followRuleItems.Select(x => x.Id).ToHashSet(); await CloseWarningRuleLinkAsync(ruleItemIds); } - private static bool CanNeedFollow(ReturnWarningRuleItemBO oldRule, ReturnWarningRuleItemBO postRule) + private static (bool follow, bool change) CanNeedFollowAndChange(ReturnWarningRuleItemBO oldRule, ReturnWarningRuleItemBO postRule) { + var defaultFollow = (true, true); + // 时效发生更改 if (Math.Abs(oldRule.ReturnTimeSpan - postRule.ReturnTimeSpan) > 0.01f) - return true; + return defaultFollow; // 关注的轨迹状态减少 var oldStatusIds = oldRule.TrackStatusIds; var postStatusIds = postRule.TrackStatusIds; foreach (var statusId in oldStatusIds) - if (!postStatusIds.Contains(statusId)) - return true; + { + if (!postStatusIds.Contains(statusId)) // 状态减少，需要关注 + return defaultFollow; + } - return false; + // 通知对象 + var oldNotifyUserIds = oldRule.NotifyUsers.Select(x => x.UserId).ToHashSet(); + var postNotifyUserIds = oldRule.NotifyUsers.Select(x => x.UserId).ToHashSet(); + var hasChange = !oldStatusIds.SetEquals(postStatusIds) || !oldNotifyUserIds.SetEquals(postNotifyUserIds); + return (false, hasChange); } #endregion diff --git a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs index 8794b9d4..1c415b09 100644 --- a/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs +++ b/src/SJZY.Track.Application/Services/Warning/Handlers/TransportWarningHandler.cs @@ -702,8 +702,9 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen return; } - // 可能同时存在 新增/修改/删除 + // 可能同时存在 新增/修改/修改中需要关注的/删除 var updateRuleItems = new List(); + var updateFollowRuleItems = new List(); var deleteRuleItems = new List(); // 2.差异化比较 @@ -721,19 +722,19 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen if (oldRule != null && postRule != null) { //规则属性变更,(起/止状态，时效变更) - if (CanNeedFollow(oldRule, postRule)) - updateRuleItems.Add(postRule); //更新 关注新的配置 - + var (follow, change) = CanNeedFollowAndChange(oldRule, postRule); + if (follow) updateFollowRuleItems.Add(postRule); //需要关注的配置 + if (change) updateRuleItems.Add(postRule); //更新 continue; } //规则条目被删除 if (oldRule != null && postRule == null) - deleteRuleItems.Add(oldRule); //删除 关注旧配置 + deleteRuleItems.Add(oldRule); //删除 } // 3.处理变更 - await HandleRuleItemsChangeAsync(rule, scene, addRuleItems, updateRuleItems, deleteRuleItems); + await HandleRuleItemsChangeAsync(rule, scene, addRuleItems, updateRuleItems, updateFollowRuleItems, deleteRuleItems); } private async Task OnlyAddHandleAsync(WarningRuleEntity rule, TransportWarningSceneBO scene, List bos) @@ -763,6 +764,7 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen TransportWarningSceneBO scene, List addRuleItems, List updateRuleItems, + List updateFollowRuleItems, List deleteRuleItems ) { @@ -783,14 +785,15 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen if (deleteRuleItemIds.Count > 0) await _warningRuleRepository.DeleteTransportSceneRuleItemsAsync(deleteRuleItemIds); - if (updateRuleItems.Count == 0) return; + // 不存在更新需要关注的，也不存在删除的 + if (updateFollowRuleItems.Count == 0 && deleteRuleItemIds.Count == 0) return; // 1.查询变更配置相关的预警生成任务(未关闭的) - var updateRuleItemIds = updateRuleItems.Select(x => x.Id).ToHashSet(); + var updateFollowRuleItemIds = updateFollowRuleItems.Select(x => x.Id).ToHashSet(); var generateTasks = await _warningTaskRepository.GetTransportWarningDetailsGenerateTaskAsync(x => !x.IsClosed && x.WarningId == scene.WarningId - && updateRuleItemIds.Contains(x.WarningSceneRuleItemId) + && updateFollowRuleItemIds.Contains(x.WarningSceneRuleItemId) ); // 2.查询变更配置相关的预警通知任务(未关闭的) @@ -798,13 +801,13 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen !x.IsClosed && x.WarningId == rule.Id && x.WarningType == WarningRuleType.运输时效预警.GetHashCode() - && updateRuleItemIds.Contains(x.WarningRuleItemId) + && updateFollowRuleItemIds.Contains(x.WarningRuleItemId) ); // 3.查询变更配置相关的预警明细(即将超时/已超时) var warningDetails = await _warningDetailsEsRepository.GetTransportWarningDetailsAsync(new GetTransportWarningDetailsVO { - RuleItemIds = updateRuleItemIds, + RuleItemIds = updateFollowRuleItemIds, }); // 构建处理快 @@ -830,11 +833,11 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen var ruleArea = scene.AreaId.HasValue ? await _kpiAreaRepository.GetFirstAsync(x => x.Id == scene.AreaId.Value) : null; - var updateRuleItemIdDict = updateRuleItems.ToDictionary(x => x.Id); + var updateFollowRuleItemIdDict = updateFollowRuleItems.ToDictionary(x => x.Id); foreach (var group in handleBlocks.GroupBy(x => (x.OrderId, x.RuleItemId))) { var key = group.Key; - var ruleItem = updateRuleItemIdDict[key.RuleItemId]; + var ruleItem = updateFollowRuleItemIdDict[key.RuleItemId]; var orderTracks = orderTrackStatusIdsDict.GetValueOrDefault(key.OrderId); if (orderTracks == null) continue; // tips:该订单不存在任何轨迹 var orderStatusIds = orderTracks @@ -844,7 +847,7 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen //存在起始，不存在截止，视为命中 var reHit = ruleItem.CanHitRule(orderStatusIds); - // 命中规则的一定存在起始轨迹 + // 命中规则的一定存在起始轨迹，选出最早轨迹 var earliestTrack = orderTracks .Where(x => x.TrackStatusId == ruleItem.StartTrackStatusId) .OrderBy(x => x.TrackTime) @@ -972,21 +975,30 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen ); } - private static bool CanNeedFollow(TransportWarningSceneRuleItemBO oldRule, TransportWarningSceneRuleItemBO postRule) + private static (bool follow, bool change) CanNeedFollowAndChange(TransportWarningSceneRuleItemBO oldRule, TransportWarningSceneRuleItemBO postRule) { + var defaultResult = (true, true); + // 起始轨迹状态id if (oldRule.StartTrackStatusId != postRule.StartTrackStatusId) - return true; + return defaultResult; + // 截止轨迹状态id if (oldRule.EndTrackStatusId != postRule.EndTrackStatusId) - return true; + return defaultResult; + // 运输预警时效 if (Math.Abs(oldRule.TransportTimeSpan - postRule.TransportTimeSpan) > 0.01f) - return true; + return defaultResult; + // 起始轨迹生成预警时间 if (Math.Abs(oldRule.StartTrackWarningTimeSpan - postRule.StartTrackWarningTimeSpan) > 0.01f) - return true; + return defaultResult; - return false; + // 通知对象 + var oldNotifyUserIds = oldRule.NotifyUsers.Select(x => x.UserId).ToHashSet(); + var postNotifyUserIds = oldRule.NotifyUsers.Select(x => x.UserId).ToHashSet(); + var hasChange = !oldNotifyUserIds.SetEquals(postNotifyUserIds); + return (false, hasChange); } private enum HandleType