From 1a6eefae4380d032fd2f46fa7d00ba0f599c3c97 Mon Sep 17 00:00:00 2001
From: FalconFly <12919280+falconfly@user.noreply.gitee.com>
Date: Tue, 23 Jan 2024 15:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E7=8B=AC=E5=AE=9A=E4=B9=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=A1=A8=E4=B8=BB=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DatabaseDefinitions/EntityGuidId.cs        | 16 ++++++++++++++++
 .../DatabaseDefinitions/EntityIntId.cs         | 16 ++++++++++++++++
 .../DatabaseDefinitions/EntityStringId.cs      | 18 ++++++++++++++++++
 .../DatabaseDefinitions/SugarBasicTable.cs     |  7 +------
 .../DatabaseDefinitions/SugarBasicTable2.cs    | 10 ++--------
 .../DatabaseDefinitions/SugarBasicTable3.cs    | 10 ++--------
 6 files changed, 55 insertions(+), 22 deletions(-)
 create mode 100644 Falcon.SugarApi/DatabaseDefinitions/EntityGuidId.cs
 create mode 100644 Falcon.SugarApi/DatabaseDefinitions/EntityIntId.cs
 create mode 100644 Falcon.SugarApi/DatabaseDefinitions/EntityStringId.cs

diff --git a/Falcon.SugarApi/DatabaseDefinitions/EntityGuidId.cs b/Falcon.SugarApi/DatabaseDefinitions/EntityGuidId.cs
new file mode 100644
index 0000000..a877e1f
--- /dev/null
+++ b/Falcon.SugarApi/DatabaseDefinitions/EntityGuidId.cs
@@ -0,0 +1,16 @@
+using SqlSugar;
+using System;
+
+namespace Falcon.SugarApi.DatabaseDefinitions
+{
+    /// <summary>
+    /// 数据表GUID主键
+    /// </summary>
+    public class EntityGuidId {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true,ColumnDescription = "主键")]
+        public Guid Id { get; set; } = Guid.NewGuid();
+    }
+}
diff --git a/Falcon.SugarApi/DatabaseDefinitions/EntityIntId.cs b/Falcon.SugarApi/DatabaseDefinitions/EntityIntId.cs
new file mode 100644
index 0000000..5b4c12a
--- /dev/null
+++ b/Falcon.SugarApi/DatabaseDefinitions/EntityIntId.cs
@@ -0,0 +1,16 @@
+using SqlSugar;
+
+namespace Falcon.SugarApi.DatabaseDefinitions
+{
+    /// <summary>
+    /// 数据表整数主键
+    /// </summary>
+    public class EntityIntId
+    {
+        /// <summary>
+        /// 主键 默认GUID 382c74c3-721d-4f34-80e5-57657b6cbc27
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true,ColumnDescription = "主键")]
+        public int Id { get; set; }
+    }
+}
diff --git a/Falcon.SugarApi/DatabaseDefinitions/EntityStringId.cs b/Falcon.SugarApi/DatabaseDefinitions/EntityStringId.cs
new file mode 100644
index 0000000..2ec6ad3
--- /dev/null
+++ b/Falcon.SugarApi/DatabaseDefinitions/EntityStringId.cs
@@ -0,0 +1,18 @@
+using SqlSugar;
+using System.ComponentModel.DataAnnotations;
+
+namespace Falcon.SugarApi.DatabaseDefinitions
+{
+    /// <summary>
+    /// 数据表字符串主键
+    /// </summary>
+    public class EntityStringId
+    {
+        /// <summary>
+        /// 主键 默认GUID 382c74c3-721d-4f34-80e5-57657b6cbc27
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true,ColumnDescription = "主键")]
+        [MaxLength(36)] 
+        public string Id { get; set; }
+    }
+}
diff --git a/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable.cs b/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable.cs
index afe1ea0..da337c3 100644
--- a/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable.cs
+++ b/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable.cs
@@ -7,13 +7,8 @@ namespace Falcon.SugarApi.DatabaseDefinitions
     /// <summary>
     /// 基础表.只定义表基础主键和创建时间
     /// </summary>
-    public abstract class SugarBasicTable
+    public abstract class SugarBasicTable:EntityGuidId
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        [SugarColumn(IsPrimaryKey = true,ColumnDescription = "主键")]
-        public Guid Id { get; set; } = Guid.NewGuid();
         /// <summary>
         /// 创建时间
         /// </summary>
diff --git a/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable2.cs b/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable2.cs
index 67a708a..e6402f1 100644
--- a/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable2.cs
+++ b/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable2.cs
@@ -5,16 +5,10 @@ using System.ComponentModel.DataAnnotations;
 namespace Falcon.SugarApi.DatabaseDefinitions
 {
     /// <summary>
-    /// 数据表基类
+    /// 数据表基类。包括字符串类主键和创建时间
     /// </summary>
-    public abstract class SugarBasicTable2
+    public abstract class SugarBasicTable2:EntityStringId
     {
-        /// <summary>
-        /// 主键 默认GUID 382c74c3-721d-4f34-80e5-57657b6cbc27
-        /// </summary>
-        [SugarColumn(IsPrimaryKey = true,ColumnDescription = "主键")]
-        [MaxLength(36)]
-        public string Id { get; set; } = Guid.NewGuid().ToString();
         /// <summary>
         /// 创建时间
         /// </summary>
diff --git a/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable3.cs b/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable3.cs
index e9a3b31..19c85c4 100644
--- a/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable3.cs
+++ b/Falcon.SugarApi/DatabaseDefinitions/SugarBasicTable3.cs
@@ -7,14 +7,8 @@ namespace Falcon.SugarApi.DatabaseDefinitions
     /// <summary>
     /// 数据表基类。提供字符串主键，记录状态和创建时间
     /// </summary>
-    public abstract class SugarBasicTable3
+    public abstract class SugarBasicTable3:EntityStringId
     {
-        /// <summary>
-        /// 主键 默认GUID 382c74c3-721d-4f34-80e5-57657b6cbc27
-        /// </summary>
-        [SugarColumn(IsPrimaryKey = true,ColumnDescription = "主键")]
-        [MaxLength(36)]
-        public string Id { get; set; } = Guid.NewGuid().ToString();
         /// <summary>
         /// 记录状态
         /// </summary>
@@ -23,7 +17,7 @@ namespace Falcon.SugarApi.DatabaseDefinitions
         /// <summary>
         /// 创建时间
         /// </summary>
-        [Required,SugarColumn(ColumnDescription = "创建时间")]
+        [Required, SugarColumn(ColumnDescription = "创建时间")]
         public DateTime CreateTime { get; set; } = DateTime.Now;
     }
 }