diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/FactorItemModel.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/FactorItemModel.cs deleted file mode 100644 index 7df7f7f2..00000000 --- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/FactorItemModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using SJZY.Track.Domain.Enums; - -namespace SJZY.Track.Domain.Aggregates.ForewarningAggregate; - -public class FactorItemModel -{ - /// - /// Gets or sets the sort order. - /// - public int Sort { get; set; } - - /// - /// Gets or sets the type of the rule factor. - /// - public RuleFactorType FactorType { get; set; } -} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRecordIndex.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRecordIndex.cs new file mode 100644 index 00000000..3cd9f954 --- /dev/null +++ b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRecordIndex.cs @@ -0,0 +1,44 @@ +using Nest; +using SJZY.Expand.ElasticSearch; +using SJZY.Track.Domain.Consts; + +namespace SJZY.Track.Domain.Aggregates.ForewarningAggregate; + +[ElasticsearchType(RelationName = GlobalConst.TrackWarningRecordsIndex)] +public class WarningRecordIndex : IdBaseIndex +{ + /// + /// 索引名称 + /// + public string IndexName { get; set; } = null!; + + /// + /// 预警名称 + /// + public string WarningName { get; set; } = null!; + + /// + /// 规则Id + /// + public int RuleId { get; set; } + + /// + /// 规则 + /// + public string Rule { get; set; } = null!; + + /// + /// 订单Id + /// + public int OrderId { get; set; } + + /// + /// 订单号 + /// + public string OrderNo { get; set; } = null!; + + /// + /// + /// + public int CustomId { get; set; } +} \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs b/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs index baf25867..7d279d6d 100644 --- a/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs +++ b/src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs @@ -13,7 +13,7 @@ public partial class GlobalConst public const string TrackPushRecordsIndex = "sjzy_track_push_records"; /// - /// 预警规则 es索引名称(模板) + /// 预警记录 es索引名称(模板) /// - public const string RuleFactorIndex = "sjzy_rule_factor"; + public const string TrackWarningRecordsIndex = "sjzy_track_warning_records"; } \ No newline at end of file diff --git a/src/SJZY.Track.Domain/Dtos/Forewarning/RuleFactor.cs b/src/SJZY.Track.Domain/Dtos/Forewarning/RuleFactor.cs deleted file mode 100644 index add12997..00000000 --- a/src/SJZY.Track.Domain/Dtos/Forewarning/RuleFactor.cs +++ /dev/null @@ -1,37 +0,0 @@ -using SJZY.Track.Domain.Aggregates.ForewarningAggregate; - -namespace SJZY.Track.Domain.Dtos.Forewarning; - -public class RuleFactor -{ - public int RuleId { get; set; } - - public int SystemId { get; set; } - - public int CustomerId { get; set; } - - /// - /// Gets or sets the start track value. - /// - public int Start { get; set; } - - /// - /// Gets or sets the end track value. - /// - public int End { get; set; } - - /// - /// Gets or sets the user to notify. - /// - public string NotifyUser { get; set; } - - /// - /// Gets or sets the notification template. - /// - public string NotifyTemplate { get; set; } - - /// - /// 获取或设置因素项模型的列表。 - /// - public List FactorItems { get; set; } -} \ No newline at end of file