Merge branch 'S07' into test
This commit is contained in:
commit
af6fb6506c
@ -595,7 +595,7 @@ public sealed class ReturnWarningHandler : IReturnWarningHandler, ITransientDepe
|
|||||||
private static bool CanNeedFollow(ReturnWarningRuleItemBO oldRule, ReturnWarningRuleItemBO postRule)
|
private static bool CanNeedFollow(ReturnWarningRuleItemBO oldRule, ReturnWarningRuleItemBO postRule)
|
||||||
{
|
{
|
||||||
// 时效发生更改
|
// 时效发生更改
|
||||||
if (Math.Abs(oldRule.ReturnTimeSpan - postRule.ReturnTimeSpan) > 1.0)
|
if (Math.Abs(oldRule.ReturnTimeSpan - postRule.ReturnTimeSpan) > 0.1f)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// 关注的轨迹状态减少
|
// 关注的轨迹状态减少
|
||||||
|
|||||||
@ -968,10 +968,10 @@ public class TransportWarningHandler : ITransportWarningHandler, ITransientDepen
|
|||||||
if (oldRule.EndTrackStatusId != postRule.EndTrackStatusId)
|
if (oldRule.EndTrackStatusId != postRule.EndTrackStatusId)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (Math.Abs(oldRule.TransportTimeSpan - postRule.TransportTimeSpan) > 1.0f)
|
if (Math.Abs(oldRule.TransportTimeSpan - postRule.TransportTimeSpan) > 0.1f)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (Math.Abs(oldRule.StartTrackWarningTimeSpan - postRule.StartTrackWarningTimeSpan) > 1.0f)
|
if (Math.Abs(oldRule.StartTrackWarningTimeSpan - postRule.StartTrackWarningTimeSpan) > 0.1f)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user