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 +{ + /// + /// 数据表GUID主键 + /// + public class EntityGuidId { + /// + /// 主键 + /// + [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 +{ + /// + /// 数据表整数主键 + /// + public class EntityIntId + { + /// + /// 主键 默认GUID 382c74c3-721d-4f34-80e5-57657b6cbc27 + /// + [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 +{ + /// + /// 数据表字符串主键 + /// + public class EntityStringId + { + /// + /// 主键 默认GUID 382c74c3-721d-4f34-80e5-57657b6cbc27 + /// + [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 /// /// 基础表.只定义表基础主键和创建时间 /// - public abstract class SugarBasicTable + public abstract class SugarBasicTable:EntityGuidId { - /// - /// 主键 - /// - [SugarColumn(IsPrimaryKey = true,ColumnDescription = "主键")] - public Guid Id { get; set; } = Guid.NewGuid(); /// /// 创建时间 /// 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 { /// - /// 数据表基类 + /// 数据表基类。包括字符串类主键和创建时间 /// - public abstract class SugarBasicTable2 + public abstract class SugarBasicTable2:EntityStringId { - /// - /// 主键 默认GUID 382c74c3-721d-4f34-80e5-57657b6cbc27 - /// - [SugarColumn(IsPrimaryKey = true,ColumnDescription = "主键")] - [MaxLength(36)] - public string Id { get; set; } = Guid.NewGuid().ToString(); /// /// 创建时间 /// 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 /// /// 数据表基类。提供字符串主键,记录状态和创建时间 /// - public abstract class SugarBasicTable3 + public abstract class SugarBasicTable3:EntityStringId { - /// - /// 主键 默认GUID 382c74c3-721d-4f34-80e5-57657b6cbc27 - /// - [SugarColumn(IsPrimaryKey = true,ColumnDescription = "主键")] - [MaxLength(36)] - public string Id { get; set; } = Guid.NewGuid().ToString(); /// /// 记录状态 /// @@ -23,7 +17,7 @@ namespace Falcon.SugarApi.DatabaseDefinitions /// /// 创建时间 /// - [Required,SugarColumn(ColumnDescription = "创建时间")] + [Required, SugarColumn(ColumnDescription = "创建时间")] public DateTime CreateTime { get; set; } = DateTime.Now; } }