Kaynağa Gözat

任务调度表改成雪花Id,以支持oracle没有自增列

zuohuaijun 3 yıl önce
ebeveyn
işleme
032e23a9f0

+ 0 - 10
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -307,16 +307,6 @@
             租户Id
             </summary>
         </member>
-        <member name="T:Admin.NET.Core.BaseId">
-            <summary>
-            框架实体基类自增Id
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.BaseId.Id">
-            <summary>
-            Id
-            </summary>
-        </member>
         <member name="T:Admin.NET.Core.SysCodeGen">
             <summary>
             代码生成表

+ 0 - 12
Admin.NET/Admin.NET.Core/Entity/EntityBase.cs

@@ -82,16 +82,4 @@ public abstract class EntityTenantId : EntityBaseId
     /// </summary>
     [SugarColumn(ColumnDescription = "租户Id")]
     public virtual long? TenantId { get; set; }
-}
-
-/// <summary>
-/// 框架实体基类自增Id
-/// </summary>
-public abstract class BaseId
-{
-    /// <summary>
-    /// Id
-    /// </summary>
-    [SugarColumn(ColumnDescription = "Id", IsPrimaryKey = true, IsIdentity = true)]
-    public virtual int Id { get; set; }
 }

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysJobCluster.cs

@@ -4,7 +4,7 @@
 /// 系统作业集群表
 /// </summary>
 [SugarTable("sys_job_cluster", "系统作业集群表")]
-public class SysJobCluster : BaseId
+public class SysJobCluster : EntityBaseId
 {
     /// <summary>
     /// 作业集群Id

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysJobDetail.cs

@@ -4,7 +4,7 @@
 /// 系统作业信息表
 /// </summary>
 [SugarTable("sys_job_detail", "系统作业信息表")]
-public class SysJobDetail : BaseId
+public class SysJobDetail : EntityBaseId
 {
     /// <summary>
     /// 作业Id

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysJobTrigger.cs

@@ -4,7 +4,7 @@
 /// 系统作业触发器表
 /// </summary>
 [SugarTable("sys_job_trigger", "系统作业触发器表")]
-public class SysJobTrigger : BaseId
+public class SysJobTrigger : EntityBaseId
 {
     /// <summary>
     /// 触发器Id

+ 2 - 2
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -104,8 +104,8 @@ public static class SqlSugarSetup
         {
             if (entityInfo.OperationType == DataFilterType.InsertByObject)
             {
-                // 主键(long类型)非自增且没有值的---赋值雪花Id
-                if (entityInfo.EntityColumnInfo.IsPrimarykey && !entityInfo.EntityColumnInfo.IsIdentity && entityInfo.EntityColumnInfo.PropertyInfo.PropertyType == typeof(long))
+                // 主键(long类型)且没有值的---赋值雪花Id
+                if (entityInfo.EntityColumnInfo.IsPrimarykey && entityInfo.EntityColumnInfo.PropertyInfo.PropertyType == typeof(long))
                 {
                     var id = entityInfo.EntityColumnInfo.PropertyInfo.GetValue(entityInfo.EntityValue);
                     if (id == null || (long)id == 0)