- 增加 Aop.AuditValue 事件，在插入/更新数据时审计属性值；

28810 · 28810 · commit b57d35ae9b79 · 2019-08-25T18:13:02.000+08:00
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlAopTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlAopTest.cs
@@ -0,0 +1,40 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using Xunit;
+
+namespace FreeSql.Tests.MySqlConnector
+{
+    public class MySqlAop
+    {
+
+        class TestAuditValue
+        {
+            public Guid id { get; set; }
+            [Now]
+            public DateTime createtime { get; set; }
+        }
+        class NowAttribute: Attribute { }
+
+        [Fact]
+        public void AuditValue()
+        {
+            var now = DateTime.Now;
+            var item = new TestAuditValue();
+
+            EventHandler<Aop.AuditValueEventArgs> audit = (s, e) =>
+             {
+                 if (e.Property.GetCustomAttribute<NowAttribute>(false) != null)
+                     e.Value = DateTime.Now;
+             };
+            g.mysql.Aop.AuditValue += audit;
+
+            g.mysql.Insert(item).ExecuteAffrows();
+
+            g.mysql.Aop.AuditValue -= audit;
+
+            Assert.Equal(item.createtime.Date, now.Date);
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests/MySql/MySqlAopTest.cs b/FreeSql.Tests/FreeSql.Tests/MySql/MySqlAopTest.cs
@@ -0,0 +1,40 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using Xunit;
+
+namespace FreeSql.Tests.MySql
+{
+    public class MySqlAopTest
+    {
+
+        class TestAuditValue
+        {
+            public Guid id { get; set; }
+            [Now]
+            public DateTime createtime { get; set; }
+        }
+        class NowAttribute: Attribute { }
+
+        [Fact]
+        public void AuditValue()
+        {
+            var now = DateTime.Now;
+            var item = new TestAuditValue();
+
+            EventHandler<Aop.AuditValueEventArgs> audit = (s, e) =>
+             {
+                 if (e.Property.GetCustomAttribute<NowAttribute>(false) != null)
+                     e.Value = DateTime.Now;
+             };
+            g.mysql.Aop.AuditValue += audit;
+
+            g.mysql.Insert(item).ExecuteAffrows();
+
+            g.mysql.Aop.AuditValue -= audit;
+
+            Assert.Equal(item.createtime.Date, now.Date);
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests/Oracle/OracleAopTest.cs b/FreeSql.Tests/FreeSql.Tests/Oracle/OracleAopTest.cs
@@ -0,0 +1,40 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using Xunit;
+
+namespace FreeSql.Tests.Oracle
+{
+    public class OracleAopTest
+    {
+
+        class TestAuditValue
+        {
+            public Guid id { get; set; }
+            [Now]
+            public DateTime createtime { get; set; }
+        }
+        class NowAttribute: Attribute { }
+
+        [Fact]
+        public void AuditValue()
+        {
+            var now = DateTime.Now;
+            var item = new TestAuditValue();
+
+            EventHandler<Aop.AuditValueEventArgs> audit = (s, e) =>
+             {
+                 if (e.Property.GetCustomAttribute<NowAttribute>(false) != null)
+                     e.Value = DateTime.Now;
+             };
+            g.oracle.Aop.AuditValue += audit;
+
+            g.oracle.Insert(item).ExecuteAffrows();
+
+            g.oracle.Aop.AuditValue -= audit;
+
+            Assert.Equal(item.createtime.Date, now.Date);
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLAopTest.cs b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLAopTest.cs
@@ -0,0 +1,40 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using Xunit;
+
+namespace FreeSql.Tests.PostgreSQL
+{
+    public class PostgreSQLAopTest
+    {
+
+        class TestAuditValue
+        {
+            public Guid id { get; set; }
+            [Now]
+            public DateTime createtime { get; set; }
+        }
+        class NowAttribute: Attribute { }
+
+        [Fact]
+        public void AuditValue()
+        {
+            var now = DateTime.Now;
+            var item = new TestAuditValue();
+
+            EventHandler<Aop.AuditValueEventArgs> audit = (s, e) =>
+             {
+                 if (e.Property.GetCustomAttribute<NowAttribute>(false) != null)
+                     e.Value = DateTime.Now;
+             };
+            g.pgsql.Aop.AuditValue += audit;
+
+            g.pgsql.Insert(item).ExecuteAffrows();
+
+            g.pgsql.Aop.AuditValue -= audit;
+
+            Assert.Equal(item.createtime.Date, now.Date);
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAopTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerAopTest.cs
@@ -0,0 +1,40 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using Xunit;
+
+namespace FreeSql.Tests.SqlServer
+{
+    public class SqlServerAopTest
+    {
+
+        class TestAuditValue
+        {
+            public Guid id { get; set; }
+            [Now]
+            public DateTime createtime { get; set; }
+        }
+        class NowAttribute: Attribute { }
+
+        [Fact]
+        public void AuditValue()
+        {
+            var now = DateTime.Now;
+            var item = new TestAuditValue();
+
+            EventHandler<Aop.AuditValueEventArgs> audit = (s, e) =>
+             {
+                 if (e.Property.GetCustomAttribute<NowAttribute>(false) != null)
+                     e.Value = DateTime.Now;
+             };
+            g.sqlserver.Aop.AuditValue += audit;
+
+            g.sqlserver.Insert(item).ExecuteAffrows();
+
+            g.sqlserver.Aop.AuditValue -= audit;
+
+            Assert.Equal(item.createtime.Date, now.Date);
+        }
+    }
+}
diff --git a/FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteAopTest.cs b/FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteAopTest.cs
@@ -0,0 +1,40 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using Xunit;
+
+namespace FreeSql.Tests.Sqlite
+{
+    public class SqliteAopTest
+    {
+
+        class TestAuditValue
+        {
+            public Guid id { get; set; }
+            [Now]
+            public DateTime createtime { get; set; }
+        }
+        class NowAttribute: Attribute { }
+
+        [Fact]
+        public void AuditValue()
+        {
+            var now = DateTime.Now;
+            var item = new TestAuditValue();
+
+            EventHandler<Aop.AuditValueEventArgs> audit = (s, e) =>
+             {
+                 if (e.Property.GetCustomAttribute<NowAttribute>(false) != null)
+                     e.Value = DateTime.Now;
+             };
+            g.sqlite.Aop.AuditValue += audit;
+
+            g.sqlite.Insert(item).ExecuteAffrows();
+
+            g.sqlite.Aop.AuditValue -= audit;
+
+            Assert.Equal(item.createtime.Date, now.Date);
+        }
+    }
+}
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/FreeSql/Interface/IAop.cs b/FreeSql/Interface/IAop.cs
@@ -1,5 +1,6 @@
 ﻿using FreeSql.DataAnnotations;
 using FreeSql.DatabaseModel;
+using FreeSql.Internal.Model;
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
@@ -53,6 +54,11 @@ public interface IAop
         /// CodeFirst迁移，执行完成触发
         /// </summary>
         EventHandler<Aop.SyncStructureAfterEventArgs> SyncStructureAfter { get; set; }
+
+        /// <summary>
+        /// Insert/Update自动值处理, e.Column.SetMapValue(
+        /// </summary>
+        EventHandler<Aop.AuditValueEventArgs> AuditValue { get; set; }
     }
 }
 
@@ -264,4 +270,43 @@ public SyncStructureAfterEventArgs(SyncStructureBeforeEventArgs before, string s
         /// </summary>
         public long ElapsedMilliseconds => this.Stopwatch.ElapsedMilliseconds;
     }
+
+    public class AuditValueEventArgs : EventArgs
+    {
+        public AuditValueEventArgs(AutoValueType autoValueType, ColumnInfo column, PropertyInfo property, object value)
+        {
+            this.AutoValueType = autoValueType;
+            this.Column = column;
+            this.Property = property;
+            this.Value = value;
+        }
+
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public AutoValueType AutoValueType { get; }
+        /// <summary>
+        /// 属性列的元数据
+        /// </summary>
+        public ColumnInfo Column { get; }
+        /// <summary>
+        /// 反射的属性信息
+        /// </summary>
+        public PropertyInfo Property { get; }
+        /// <summary>
+        /// 获取实体的属性值，也可以设置实体的属性新值
+        /// </summary>
+        public object Value
+        {
+            get => _value;
+            set
+            {
+                _value = value;
+                this.IsChanged = true;
+            }
+        }
+        private object _value;
+        internal bool IsChanged { get; private set; }
+    }
+    public enum AutoValueType { Update, Insert }
 }
diff --git a/FreeSql/Internal/CommonProvider/AopProvider.cs b/FreeSql/Internal/CommonProvider/AopProvider.cs
@@ -17,5 +17,6 @@ public class AopProvider : IAop
         public EventHandler<Aop.CurdAfterEventArgs> CurdAfter { get; set; }
         public EventHandler<Aop.SyncStructureBeforeEventArgs> SyncStructureBefore { get; set; }
         public EventHandler<Aop.SyncStructureAfterEventArgs> SyncStructureAfter { get; set; }
+        public EventHandler<Aop.AuditValueEventArgs> AuditValue { get; set; }
     }
 }
diff --git a/FreeSql/Internal/CommonProvider/InsertProvider.cs b/FreeSql/Internal/CommonProvider/InsertProvider.cs
@@ -559,6 +559,13 @@ public virtual string ToSql()
                     object val = col.GetMapValue(d);
                     if (col.Attribute.IsPrimary && col.Attribute.MapType.NullableTypeOrThis() == typeof(Guid) && (val == null || (Guid)val == Guid.Empty))
                         col.SetMapValue(d, val = FreeUtil.NewMongodbId());
+                    if (_orm.Aop.AuditValue != null)
+                    {
+                        var auditArgs = new Aop.AuditValueEventArgs(Aop.AutoValueType.Insert, col, _table.Properties[col.CsName], val);
+                        _orm.Aop.AuditValue(this, auditArgs);
+                        if (auditArgs.Value != null)
+                            col.SetMapValue(d, val = auditArgs.Value);
+                    }
                     if (_noneParameter)
                         sb.Append(_commonUtils.GetNoneParamaterSqlValue(specialParams, col.Attribute.MapType, val));
                     else
diff --git a/FreeSql/Internal/CommonProvider/UpdateProvider.cs b/FreeSql/Internal/CommonProvider/UpdateProvider.cs
diff --git a/Providers/FreeSql.Provider.Oracle/Curd/OracleInsert.cs b/Providers/FreeSql.Provider.Oracle/Curd/OracleInsert.cs

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@ public class AopProvider : IAop`
`17`	`17`	`public EventHandler<Aop.CurdAfterEventArgs> CurdAfter { get; set; }`
`18`	`18`	`public EventHandler<Aop.SyncStructureBeforeEventArgs> SyncStructureBefore { get; set; }`
`19`	`19`	`public EventHandler<Aop.SyncStructureAfterEventArgs> SyncStructureAfter { get; set; }`
	`20`	`+ public EventHandler<Aop.AuditValueEventArgs> AuditValue { get; set; }`
`20`	`21`	`}`
`21`	`22`	`}`