ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：CalcRuleList

Browse Source
This commit is contained in:
xiaolipro 2024-07-26 15:54:21 +08:00
parent e4b8fb4fcf
commit 0be6d452ee
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SJZY.Track.Application/AutoMapper/ForewarningMapperProfile.cs
View File

@ -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<CreateWarningInput, WarningEntity>(MemberList.None);
CreateMap<CreateWarningInput, WarningEntity>(MemberList.None)
.Ignore(x => x.WarningFactors);
CreateMap<WarningTimeSpanDto, WarningRuleEntity>(MemberList.None);
CreateMap<RuleAreaEntity, AreaDto>();
CreateMap<UpdateRuleAreaRequest, RuleAreaEntity>(MemberList.None);

14
src/SJZY.Track.Application/Helpers/ForewarningHelper.cs
View File

@ -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<WarningRuleEntity>(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<WarningNitifyDto> statusSpans, List<WarningRuleEntity> 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;
}