Merge branch 'refs/heads/S04轨迹预警' into test

src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/FactorItemModel.cs

@@ -1,16 +0,0 @@
-using SJZY.Track.Domain.Enums;
-
-namespace SJZY.Track.Domain.Aggregates.ForewarningAggregate;
-
-public class FactorItemModel
-{
-    /// <summary>
-    /// Gets or sets the sort order.
-    /// </summary>
-    public int Sort { get; set; }
-
-    /// <summary>
-    /// Gets or sets the type of the rule factor.
-    /// </summary>
-    public RuleFactorType FactorType { get; set; }
-}

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
+{
+    /// <summary>
+    /// 索引名称
+    /// </summary>
+    public string IndexName { get; set; } = null!;
+
+    /// <summary>
+    /// 预警名称
+    /// </summary>
+    public string WarningName { get; set; } = null!;
+    
+    /// <summary>
+    /// 规则Id
+    /// </summary>
+    public int RuleId { get; set; }
+
+    /// <summary>
+    /// 规则
+    /// </summary>
+    public string Rule { get; set; } = null!;
+    
+    /// <summary>
+    /// 订单Id
+    /// </summary>
+    public int OrderId { get; set; }
+
+    /// <summary>
+    /// 订单号
+    /// </summary>
+    public string OrderNo { get; set; } = null!;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int CustomId { get; set; }
+}

src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRuleEntity.cs

@@ -42,7 +42,7 @@ public class WarningRuleEntity : IFullAuditedBasicEntitys, IEntity
     /// <summary>
     /// 起始轨迹状态（冗余）
     /// </summary>
-    [SugarColumn(ColumnName = "StartTrackStatusId")]
+    [SugarColumn(ColumnName = "StartTrackStatus")]
     public string StartTrackStatus { get; set; } = null!;
 
     /// <summary>

src/SJZY.Track.Domain/Consts/GlobalConst.ES.cs

@@ -13,7 +13,7 @@ public partial class GlobalConst
     public const string TrackPushRecordsIndex = "sjzy_track_push_records";
     
     /// <summary>
-    /// 预警规则 es索引名称（模板）
+    /// 预警记录 es索引名称（模板）
     /// </summary>
-    public const string RuleFactorIndex = "sjzy_rule_factor";
+    public const string TrackWarningRecordsIndex = "sjzy_track_warning_records";
 }

src/SJZY.Track.Domain/Dtos/Forewarning/RuleFactor.cs

@@ -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; }
-    
-    /// <summary>
-    /// Gets or sets the start track value.
-    /// </summary>
-    public int Start { get; set; }
-
-    /// <summary>
-    /// Gets or sets the end track value.
-    /// </summary>
-    public int End { get; set; }
-
-    /// <summary>
-    /// Gets or sets the user to notify.
-    /// </summary>
-    public string NotifyUser { get; set; }
-
-    /// <summary>
-    /// Gets or sets the notification template.
-    /// </summary>
-    public string NotifyTemplate { get; set; }
-    
-    /// <summary>
-    /// 获取或设置因素项模型的列表。
-    /// </summary>
-    public List<FactorItemModel> FactorItems { get; set; }
-}