From cee0e1e888dbd50a3f192b664194467e3b192df3 Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Fri, 2 Aug 2024 10:52:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=20Column=20'StartTrackStatusId?=
 =?UTF-8?q?'=20specified=20twice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Aggregates/ForewarningAggregate/WarningRuleEntity.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRuleEntity.cs b/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRuleEntity.cs
index 56a95930..f6141704 100644
--- a/src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRuleEntity.cs
+++ b/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>

From ed5b46586f8e5bfb478e0bce3de50660e3dd8b4d Mon Sep 17 00:00:00 2001
From: xiaolipro <2357729423@qq.com>
Date: Fri, 2 Aug 2024 15:01:32 +0800
Subject: [PATCH 2/2] temp

---
 .../ForewarningAggregate/FactorItemModel.cs   | 16 -------
 .../WarningRecordIndex.cs                     | 44 +++++++++++++++++++
 .../Consts/GlobalConst.ES.cs                  |  4 +-
 .../Dtos/Forewarning/RuleFactor.cs            | 37 ----------------
 4 files changed, 46 insertions(+), 55 deletions(-)
 delete mode 100644 src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/FactorItemModel.cs
 create mode 100644 src/SJZY.Track.Domain/Aggregates/ForewarningAggregate/WarningRecordIndex.cs
 delete mode 100644 src/SJZY.Track.Domain/Dtos/Forewarning/RuleFactor.cs

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
-{
-    /// <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; }
-}
\ 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
+{
+    /// <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; }
+}
\ 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";
     
     /// <summary>
-    /// 预警规则 es索引名称（模板）
+    /// 预警记录 es索引名称（模板）
     /// </summary>
-    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; }
-    
-    /// <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; }
-}
\ No newline at end of file