From bd8879885bbbe70f3ed262847ce8fe5ef181e54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=9F=E5=96=9C=E6=97=BA?= Date: Fri, 26 Jul 2024 15:12:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A=20=E8=B0=83=E6=95=B4area?= =?UTF-8?q?=E7=9A=84=E8=A1=A8=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Aggregates/KPIAreaAggregate/RuleAreaEntity.cs | 2 +- .../Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs index 2f404cea..5d43a11a 100644 --- a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaEntity.cs @@ -1,6 +1,6 @@ namespace SJZY.Track.Domain.Aggregates.KPIAreaAggregate; -[SugarTable("t_rule_area", TableDescription = "KPI分区主表")] +[SugarTable("t_area", TableDescription = "KPI分区主表")] public class RuleAreaEntity : IAggregateRoot { /// diff --git a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs index 66b28382..5a1b97c7 100644 --- a/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/KPIAreaAggregate/RuleAreaInfoEntity.cs @@ -1,6 +1,6 @@ namespace SJZY.Track.Domain.Aggregates.KPIAreaAggregate; -[SugarTable("t_rule_area_info", TableDescription = "kpi 区域子表")] +[SugarTable("t_area_details", TableDescription = "kpi 区域子表")] public class RuleAreaInfoEntity : IEntity { /// From 45ce7a99491e02459cb2f231cd682f02fe6e7f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=9F=E5=96=9C=E6=97=BA?= Date: Fri, 26 Jul 2024 15:34:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=9E=E7=9C=81=E5=92=8C=E9=82=AE=E7=BC=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit alter table t_order add Postcode varchar(64) null comment '邮编'; alter table t_order add Province varchar(64) null comment '省份'; --- .../Aggregates/OrderAggregate/OrderEntity.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs index b04aa76a..d2999e74 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/OrderEntity.cs @@ -154,7 +154,19 @@ public class OrderEntity : IFullAuditedBasicEntitys, IAggregateRoot /// 时区缺失和发生地缺失标记，1表示时区，2表示发生地，3表示两种 /// [SugarColumn(ColumnName = "DeficiencyTag")] - public int? DeficiencyTag { get; set; } + public int? DeficiencyTag { get; set; } + + /// + /// 邮编 + /// + [SugarColumn(ColumnName = "Postcode")] + public string? Postcode { get; set; } + + /// + /// 州省 + /// + [SugarColumn(ColumnName = "Province")] + public string? Province { get; set; } [SugarColumn(IsIgnore = true)] public List OrderFlights { get; set; } [SugarColumn(IsIgnore = true)] public List OrderTemplates { get; set; } 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 3/4] =?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 4/4] =?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 { ///