Merge branch 'S07' into test
This commit is contained in:
commit
a94503c56c
@ -216,9 +216,6 @@ public class CompleteWarningService : ApplicationService
|
|||||||
// 构建缺失轨迹状态
|
// 构建缺失轨迹状态
|
||||||
List<RequireTrackStatusItem> BuildMissingTrackStatus(CompleteWarningDetailsIndex detail)
|
List<RequireTrackStatusItem> BuildMissingTrackStatus(CompleteWarningDetailsIndex detail)
|
||||||
{
|
{
|
||||||
// return detail.GetMissingTrackStatusIdGroups()
|
|
||||||
// .Select(g => g.ToDictionary(id => id.ToString(), id => trackStatusDict.GetValueOrDefault(id, GlobalConst.EmptyString)))
|
|
||||||
// .ToList();
|
|
||||||
return detail.GetMissingTrackStatusIdGroups()
|
return detail.GetMissingTrackStatusIdGroups()
|
||||||
.Select(g => new RequireTrackStatusItem
|
.Select(g => new RequireTrackStatusItem
|
||||||
{
|
{
|
||||||
@ -246,6 +243,13 @@ public class CompleteWarningService : ApplicationService
|
|||||||
}
|
}
|
||||||
|
|
||||||
var bos = CompleteWarningRuleItemBO.From(input);
|
var bos = CompleteWarningRuleItemBO.From(input);
|
||||||
|
// 同一个主体下,规则项目的检查点不能重复
|
||||||
|
var checkPointTrackStatusIds = bos.Select(x => x.CheckPointTrackStatusId).ToHashSet();
|
||||||
|
if (checkPointTrackStatusIds.Count < bos.Count)
|
||||||
|
{
|
||||||
|
throw new BusinessException(message: "完整预警规则项目检查点不能重复!");
|
||||||
|
}
|
||||||
|
|
||||||
await _completeWarningHandler.HandleEditAsync(rule, bos);
|
await _completeWarningHandler.HandleEditAsync(rule, bos);
|
||||||
return new UnifyResultDto(true);
|
return new UnifyResultDto(true);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user