测试表增删查改，DBFirst生成优化

Tiobon.Core.Api/appsettings.json

@@ -74,8 +74,8 @@
             }
         },
         "Date": "2018-08-28",
-        "SeedDBEnabled": true, //只生成表结构
-        "SeedDBDataEnabled": true, //生成表,并初始化数据
+        "SeedDBEnabled": false, //只生成表结构
+        "SeedDBDataEnabled": false, //生成表,并初始化数据
         "Author": "Tiobon.Core",
         "SvcName": "", // /svc/Tiobon
         "UseLoadTest": false

Tiobon.Core.Common/DB/Aop/SqlsugarAop.cs

@@ -91,29 +91,21 @@ public static class SqlSugarAop
             {
                 case DataFilterType.InsertByObject:
                     var dyCreateBy = getType.GetProperty("CreateBy");
-                    var dyCreateId = getType.GetProperty("CreateId");
                     var dyCreateTime = getType.GetProperty("CreateTime");
 
                     if (App.User?.ID > 0 && dyCreateBy != null && dyCreateBy.GetValue(entityInfo.EntityValue) == null)
-                        dyCreateBy.SetValue(entityInfo.EntityValue, App.User.Name);
-
-                    if (App.User?.ID > 0 && dyCreateId != null && dyCreateId.GetValue(entityInfo.EntityValue) == null)
-                        dyCreateId.SetValue(entityInfo.EntityValue, App.User.ID);
+                        dyCreateBy.SetValue(entityInfo.EntityValue, (int)App.User.ID);
 
                     if (dyCreateTime != null && dyCreateTime.GetValue(entityInfo.EntityValue) != null && (DateTime)dyCreateTime.GetValue(entityInfo.EntityValue) == DateTime.MinValue)
                         dyCreateTime.SetValue(entityInfo.EntityValue, DateTime.Now);
 
                     break;
                 case DataFilterType.UpdateByObject:
-                    var dyModifyBy = getType.GetProperty("ModifyBy");
-                    var dyModifyId = getType.GetProperty("ModifyId");
-                    var dyModifyTime = getType.GetProperty("ModifyTime");
-
-                    if (App.User?.ID > 0 && dyModifyBy != null)
-                        dyModifyBy.SetValue(entityInfo.EntityValue, App.User.Name);
+                    var UpdateBy = getType.GetProperty("UpdateBy");
+                    var dyModifyTime = getType.GetProperty("UpdateTime");
 
-                    if (App.User?.ID > 0 && dyModifyId != null)
-                        dyModifyId.SetValue(entityInfo.EntityValue, App.User.ID);
+                    if (App.User?.ID > 0 && UpdateBy != null)
+                        UpdateBy.SetValue(entityInfo.EntityValue, (int)App.User.ID);
 
                     if (dyModifyTime != null)
                         dyModifyTime.SetValue(entityInfo.EntityValue, DateTime.Now);

Tiobon.Core.Common/DB/RepositorySetting.cs

@@ -2,9 +2,6 @@
 using Tiobon.Core.Model.Models.RootTkey.Interface;
 using Tiobon.Core.Model.Tenants;
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Tiobon.Core.Common.DB;
 
@@ -27,6 +24,7 @@ public class RepositorySetting
     public static void SetDeletedEntityFilter(SqlSugarScopeProvider db)
     {
         db.QueryFilter.AddTableFilter<IDeleteFilter>(it => it.IsDeleted == false);
+        db.QueryFilter.AddTableFilter<IBaseDeleteFilter>(it => it.IsEnable == 1);
     }
 
     /// <summary>

Tiobon.Core.Model/Base/BasePoco.cs

@@ -1,10 +1,11 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using SqlSugar;
+using Tiobon.Core.Model.Models.RootTkey.Interface;
 
 namespace Tiobon.Core.Model
 {
-    public class BasePoco
+    public class BasePoco : IBaseDeleteFilter
     {
 
         /// <summary>
@@ -24,7 +25,7 @@ namespace Tiobon.Core.Model
         /// 1:有效,0:未生效
         /// </summary>
         [Display(Name = "1:有效,0:未生效")]
-        public int? IsEnable { get; set; } = 1;
+        public int IsEnable { get; set; } = 1;
 
         /// <summary>
         /// 是否默认

Tiobon.Core.Model/Models/RootTkey/Interface/IDeleteFilter.cs

@@ -6,4 +6,8 @@
 public interface IDeleteFilter
 {
     public bool IsDeleted { get; set; }
+}
+public interface IBaseDeleteFilter
+{
+    public int IsEnable { get; set; }
 }

Tiobon.Core.Services/BASE/BaseServices.cs

@@ -55,7 +55,6 @@ namespace Tiobon.Core.Services.BASE
         /// <returns></returns>
         public async Task<long> Add(TEntity entity)
         {
-            var userId = UserContext.Current.User_Id;
             return await BaseDal.Add(entity);
         }
 

Tiobon.Core.Services/BASE/BaseServices1.cs

@@ -94,9 +94,7 @@ namespace Tiobon.Core.Services.BASE
             var ip = GetUserIp(UserContext.Context);
 
             BasePoco ent = entity as BasePoco;
-            if (ent.CreateBy != null)
-                ent.CreateBy = userId;
-            ent.CreateTime = DateTime.Now;
+
             ent.CreateIP = ip;
             ent.CreateProg = api;
 
@@ -117,10 +115,7 @@ namespace Tiobon.Core.Services.BASE
             var ip = GetUserIp(UserContext.Context);
             listEntity.ForEach(entity =>
             {
-                BasePoco ent = entity as BasePoco;
-                if (ent.CreateBy != null)
-                    ent.CreateBy = userId;
-                ent.CreateTime = DateTime.Now;
+                BasePoco ent = entity as BasePoco; 
                 ent.CreateIP = ip;
                 ent.CreateProg = api;
             });
@@ -134,8 +129,7 @@ namespace Tiobon.Core.Services.BASE
         /// <param name="entity">博文实体类</param>
         /// <returns></returns>
         public async Task<bool> Update(long Id, TEditDto editModel)
-        {
-            var userId = UserContext.Current.User_Id;
+        { 
             HttpRequest request = UserContext.Context.Request;
             var api = request.Path.ObjToString().TrimEnd('/').ToLower();
             var ip = GetUserIp(UserContext.Context);
@@ -146,8 +140,6 @@ namespace Tiobon.Core.Services.BASE
             var entity = await BaseDal.QueryById(Id);
             ConvertTEditDto2TEntity(editModel, entity);
             BasePoco ent = entity as BasePoco;
-            ent.UpdateBy = userId;
-            ent.UpdateTime = DateTime.Now;
             ent.UpdateIP = ip;
             ent.UpdateProg = api;
             return await BaseDal.Update(entity);
@@ -159,16 +151,12 @@ namespace Tiobon.Core.Services.BASE
         /// <returns></returns>
         public async Task<bool> Update(List<TEntity> listEntity)
         {
-            var userId = UserContext.Current.User_Id;
             HttpRequest request = UserContext.Context.Request;
             var api = request.Path.ObjToString().TrimEnd('/').ToLower();
             var ip = GetUserIp(UserContext.Context);
             listEntity.ForEach(entity =>
             {
                 BasePoco ent = entity as BasePoco;
-                if (ent.UpdateBy != null)
-                    ent.UpdateBy = userId;
-                ent.UpdateTime = DateTime.Now;
                 ent.UpdateIP = ip;
                 ent.UpdateProg = api;
             });
@@ -176,15 +164,11 @@ namespace Tiobon.Core.Services.BASE
         }
 
         public async Task<bool> Update(TEntity entity, string where)
-        {
-            var userId = UserContext.Current.User_Id;
+        { 
             HttpRequest request = UserContext.Context.Request;
             var api = request.Path.ObjToString().TrimEnd('/').ToLower();
             var ip = GetUserIp(UserContext.Context);
             BasePoco ent = entity as BasePoco;
-            if (ent.UpdateBy != null)
-                ent.UpdateBy = userId;
-            ent.UpdateTime = DateTime.Now;
             ent.UpdateIP = ip;
             ent.UpdateProg = api;
             return await BaseDal.Update(entity, where);