From 86a033288650840b7c9ccfc5aac0d62604d6ae46 Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Fri, 26 Jul 2024 15:54:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9ACalcRuleList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoMapper/ForewarningMapperProfile.cs | 4 +++- .../Helpers/ForewarningHelper.cs | 14 ++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs index c06978eb..2498dccb 100644 --- a/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs @@ -3,6 +3,7 @@ using SJZY.Track.Application.Contract.Dtos.Forewarning; using SJZY.Track.Domain.Aggregates.ForewarningAggregate; using SJZY.Track.Domain.Aggregates.KPIAreaAggregate; using SJZY.Track.Domain.Dtos.Forewarning; +using Volo.Abp.AutoMapper; namespace SJZY.Track.Application.AutoMapper; @@ -10,7 +11,8 @@ public class ForewarningMapperProfile :Profile { public ForewarningMapperProfile() { - CreateMap(MemberList.None); + CreateMap(MemberList.None) + .Ignore(x => x.WarningFactors); CreateMap(MemberList.None); CreateMap(); CreateMap(MemberList.None); diff --git a/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs b/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs index c03be716..cfdc5cfb 100644 --- a/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs +++ b/src/SJZY.Track.Application/Helpers/ForewarningHelper.cs @@ -23,14 +23,14 @@ public class ForewarningHelper { throw new BusinessException(message: "轨迹状态区间或因素列表为空"); } - + var len = statusSpans.Count * factors.Select(f => f.FactorValue.Count).Aggregate((pre, cur) => pre * cur); if (len == 0) { throw new BusinessException(message: "轨迹状态区间或因素列表为空"); } - var rules = new List(len); + var rules = Enumerable.Repeat(new WarningRuleEntity(), len).ToList(); var repeat = len / statusSpans.Count; @@ -39,7 +39,7 @@ public class ForewarningHelper foreach (var factor in factors) { var factorValueCount = factor.FactorValue.Count; - + // repeat梯度下降，与times成反比关系 repeat /= factor.FactorValue.Count; var times = len / repeat / factorValueCount; @@ -52,13 +52,11 @@ public class ForewarningHelper private static void FillStatus(List statusSpans, List rules, int repeat) { - for (var i = 0; i < statusSpans.Count; i++) + var row = 0; + foreach (var span in statusSpans) { - var span = statusSpans[i]; - - for (var j = 0; j < repeat; j++) + for (var i = 0; i < repeat; i++, row++) { - var row = i * repeat + j; rules[row].StartTrackStatusId = span.StartTrackStatusId; rules[row].EndTrackStatusId = span.EndTrackStatusId; } From 06d51528b03b5d64431595d3c97f42bff4ee09e5 Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Fri, 26 Jul 2024 16:00:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=E8=A1=A8=E5=90=8Dattribute?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Aggregates/ForewarningAggregate/WarningFactorEntity.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningFactorEntity.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningFactorEntity.cs index 46d9c4d8..9c342518 100644 --- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningFactorEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningFactorEntity.cs @@ -2,6 +2,7 @@ using SJZY.Track.Domain.Enums; namespace SJZY.Track.Domain.Aggregates.ForewarningAggregate; +[SugarTable("t_warning_factor")] public class WarningFactorEntity : IFullAuditedBasicEntitys, IEntity { /// From c7ae4e9d059c65384e5108318bcfeba42735c4d6 Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Fri, 26 Jul 2024 16:12:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?connect=EF=BC=9A=E5=AF=B9=E6=8E=A5=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs | 2 ++ .../Aggregates/ForewarningAggregate/WarningNotifyEntity.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs index c20ca137..f402f3d1 100644 --- a/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs +++ b/src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs @@ -33,6 +33,8 @@ public class TrackChangeAfterUpdateOrderEventHandler : ITransientDependency, ICa LatestTrackPlace = x.LatestTrackPlace, LatestTrackTime = x.LatestTrackTime, LatestTrackTimeZone = x.LatestTrackTimeZone, + ArrivalCountry = x.ArrivalCountry, + ArrivalCity = x.ArrivalCity, }); if (orders.Count == 0) return; diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningNotifyEntity.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningNotifyEntity.cs index 1b08f86f..1b846469 100644 --- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningNotifyEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningNotifyEntity.cs @@ -2,6 +2,7 @@ using SJZY.Track.Domain.Enums; namespace SJZY.Track.Domain.Aggregates.ForewarningAggregate; +[SugarTable("t_warning_notify")] public class WarningNotifyEntity : IFullAuditedBasicEntitys, IEntity { ///