From 4148427f1afd6dd5183f2df9c1516bfa9dda9675 Mon Sep 17 00:00:00 2001 From: yubaolee Date: Wed, 28 Apr 2021 10:20:24 +0800 Subject: [PATCH] =?UTF-8?q?fix=20#I3O97D=20=E7=AB=99=E7=82=B9=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=97=B6=E8=87=AA=E5=8A=A8=E8=BF=90=E8=A1=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E3=80=90=E6=AD=A3=E5=9C=A8=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E3=80=91=E7=9A=84=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1;=20fix?= =?UTF-8?q?=20#I3ODHI=20=E5=A2=9E=E5=8A=A0=E5=AD=98=E5=82=A8=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E8=B0=83=E7=94=A8=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Infrastructure/Const/JobStatus.cs | 17 + .../Database/DbDataConvertExtensions.cs | 412 ++++++++++++++++++ Infrastructure/Extensions/ObjectExtension.cs | 335 ++++++++++++-- OpenAuth.App/Extensions/OpenJobExt.cs | 55 +++ OpenAuth.App/HostedService/QuartzService.cs | 6 +- OpenAuth.App/Jobs/OpenJobApp.cs | 78 ++-- OpenAuth.Repository/Interface/IUnitWork.cs | 9 + OpenAuth.Repository/OpenAuthDBContext.cs | 4 +- OpenAuth.Repository/Test/TestUnitWork.cs | 28 ++ OpenAuth.Repository/UnitWork.cs | 29 +- 10 files changed, 892 insertions(+), 81 deletions(-) create mode 100644 Infrastructure/Const/JobStatus.cs create mode 100644 Infrastructure/Database/DbDataConvertExtensions.cs create mode 100644 OpenAuth.App/Extensions/OpenJobExt.cs create mode 100644 OpenAuth.Repository/Test/TestUnitWork.cs diff --git a/Infrastructure/Const/JobStatus.cs b/Infrastructure/Const/JobStatus.cs new file mode 100644 index 00000000..7616d75c --- /dev/null +++ b/Infrastructure/Const/JobStatus.cs @@ -0,0 +1,17 @@ +namespace Infrastructure.Const +{ + /// + /// 定时任务状态 + /// + public enum JobStatus + { + /// + /// 未启动 + /// + NotRun, + /// + /// 正在运行 + /// + Running + } +} \ No newline at end of file diff --git a/Infrastructure/Database/DbDataConvertExtensions.cs b/Infrastructure/Database/DbDataConvertExtensions.cs new file mode 100644 index 00000000..517f7add --- /dev/null +++ b/Infrastructure/Database/DbDataConvertExtensions.cs @@ -0,0 +1,412 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Data; +using System.Linq; +using System.Reflection; +using System.Threading.Tasks; +using Infrastructure.Extensions; + +namespace Infrastructure.Database +{ + /// + /// 数据库数据转换拓展 + /// + public static class DbDataConvertExtensions + { + /// + /// 将 DataTable 转 List 集合 + /// + /// 返回值类型 + /// DataTable + /// List{T} + public static List ToList(this DataTable dataTable) + { + return dataTable.ToList(typeof(List)) as List; + } + + /// + /// 将 DataTable 转 List 集合 + /// + /// 返回值类型 + /// DataTable + /// List{T} + public static async Task> ToListAsync(this DataTable dataTable) + { + var list = await dataTable.ToListAsync(typeof(List)); + return list as List; + } + + /// + /// 将 DataSet 转 元组 + /// + /// 元组元素类型 + /// DataSet + /// 元组类型 + public static List ToList(this DataSet dataSet) + { + var tuple = dataSet.ToList(typeof(List)); + return tuple[0] as List; + } + + /// + /// 将 DataSet 转 元组 + /// + /// 元组元素类型 + /// 元组元素类型 + /// DataSet + /// 元组类型 + public static (List list1, List list2) ToList(this DataSet dataSet) + { + var tuple = dataSet.ToList(typeof(List), typeof(List)); + return (tuple[0] as List, tuple[1] as List); + } + + /// + /// 将 DataSet 转 元组 + /// + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// DataSet + /// 元组类型 + public static (List list1, List list2, List list3) ToList(this DataSet dataSet) + { + var tuple = dataSet.ToList(typeof(List), typeof(List), typeof(List)); + return (tuple[0] as List, tuple[1] as List, tuple[2] as List); + } + + /// + /// 将 DataSet 转 元组 + /// + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// DataSet + /// 元组类型 + public static (List list1, List list2, List list3, List list4) ToList(this DataSet dataSet) + { + var tuple = dataSet.ToList(typeof(List), typeof(List), typeof(List), typeof(List)); + return (tuple[0] as List, tuple[1] as List, tuple[2] as List, tuple[3] as List); + } + + /// + /// 将 DataSet 转 元组 + /// + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// DataSet + /// 元组类型 + public static (List list1, List list2, List list3, List list4, List list5) ToList(this DataSet dataSet) + { + var tuple = dataSet.ToList(typeof(List), typeof(List), typeof(List), typeof(List), typeof(List)); + return (tuple[0] as List, tuple[1] as List, tuple[2] as List, tuple[3] as List, tuple[4] as List); + } + + /// + /// 将 DataSet 转 元组 + /// + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// DataSet + /// 元组类型 + public static (List list1, List list2, List list3, List list4, List list5, List list6) ToList(this DataSet dataSet) + { + var tuple = dataSet.ToList(typeof(List), typeof(List), typeof(List), typeof(List), typeof(List), typeof(List)); + return (tuple[0] as List, tuple[1] as List, tuple[2] as List, tuple[3] as List, tuple[4] as List, tuple[5] as List); + } + + /// + /// 将 DataSet 转 元组 + /// + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// DataSet + /// 元组类型 + public static (List list1, List list2, List list3, List list4, List list5, List list6, List list7) ToList(this DataSet dataSet) + { + var tuple = dataSet.ToList(typeof(List), typeof(List), typeof(List), typeof(List), typeof(List), typeof(List), typeof(List)); + return (tuple[0] as List, tuple[1] as List, tuple[2] as List, tuple[3] as List, tuple[4] as List, tuple[5] as List, tuple[6] as List); + } + + /// + /// 将 DataSet 转 元组 + /// + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// 元组元素类型 + /// DataSet + /// 元组类型 + public static (List list1, List list2, List list3, List list4, List list5, List list6, List list7, List list8) ToList(this DataSet dataSet) + { + var tuple = dataSet.ToList(typeof(List), typeof(List), typeof(List), typeof(List), typeof(List), typeof(List), typeof(List), typeof(List)); + return (tuple[0] as List, tuple[1] as List, tuple[2] as List, tuple[3] as List, tuple[4] as List, tuple[5] as List, tuple[6] as List, tuple[7] as List); + } + + /// + /// 将 DataSet 转 特定类型 + /// + /// DataSet + /// 特定类型集合 + /// List{object} + public static List ToList(this DataSet dataSet, params Type[] returnTypes) + { + if (returnTypes == null || returnTypes.Length == 0) return default; + + // 处理元组类型 + if (returnTypes.Length == 1 && returnTypes[0].IsValueType) + { + returnTypes = returnTypes[0].GenericTypeArguments; + } + + // 获取所有的 DataTable + var dataTables = dataSet.Tables; + + // 处理 8 个结果集 + if (returnTypes.Length >= 8) + { + return new List + { + dataTables[0].ToList(returnTypes[0]), + dataTables[1].ToList(returnTypes[1]), + dataTables[2].ToList(returnTypes[2]), + dataTables[3].ToList(returnTypes[3]), + dataTables[4].ToList(returnTypes[4]), + dataTables[5].ToList(returnTypes[5]), + dataTables[6].ToList(returnTypes[6]), + dataTables[7].ToList(returnTypes[7]) + }; + } + // 处理 7 个结果集 + else if (returnTypes.Length == 7) + { + return new List + { + dataTables[0].ToList(returnTypes[0]), + dataTables[1].ToList(returnTypes[1]), + dataTables[2].ToList(returnTypes[2]), + dataTables[3].ToList(returnTypes[3]), + dataTables[4].ToList(returnTypes[4]), + dataTables[5].ToList(returnTypes[5]), + dataTables[6].ToList(returnTypes[6]) + }; + } + // 处理 6 个结果集 + else if (returnTypes.Length == 6) + { + return new List + { + dataTables[0].ToList(returnTypes[0]), + dataTables[1].ToList(returnTypes[1]), + dataTables[2].ToList(returnTypes[2]), + dataTables[3].ToList(returnTypes[3]), + dataTables[4].ToList(returnTypes[4]), + dataTables[5].ToList(returnTypes[5]) + }; + } + // 处理 5 个结果集 + else if (returnTypes.Length == 5) + { + return new List + { + dataTables[0].ToList(returnTypes[0]), + dataTables[1].ToList(returnTypes[1]), + dataTables[2].ToList(returnTypes[2]), + dataTables[3].ToList(returnTypes[3]), + dataTables[4].ToList(returnTypes[4]) + }; + } + // 处理 4 个结果集 + else if (returnTypes.Length == 4) + { + return new List + { + dataTables[0].ToList(returnTypes[0]), + dataTables[1].ToList(returnTypes[1]), + dataTables[2].ToList(returnTypes[2]), + dataTables[3].ToList(returnTypes[3]) + }; + } + // 处理 3 个结果集 + else if (returnTypes.Length == 3) + { + return new List + { + dataTables[0].ToList(returnTypes[0]), + dataTables[1].ToList(returnTypes[1]), + dataTables[2].ToList(returnTypes[2]) + }; + } + // 处理 2 个结果集 + else if (returnTypes.Length == 2) + { + return new List + { + dataTables[0].ToList(returnTypes[0]), + dataTables[1].ToList(returnTypes[1]) + }; + } + // 处理 1 个结果集 + else + { + return new List + { + dataTables[0].ToList(returnTypes[0]) + }; + } + } + + /// + /// 将 DataSet 转 特定类型 + /// + /// DataSet + /// 特定类型集合 + /// object + public static Task> ToListAsync(this DataSet dataSet, params Type[] returnTypes) + { + return Task.FromResult(dataSet.ToList(returnTypes)); + } + + /// + /// 将 DataTable 转 特定类型 + /// + /// DataTable + /// 返回值类型 + /// object + public static object ToList(this DataTable dataTable, Type returnType) + { + var isGenericType = returnType.IsGenericType; + // 获取类型真实返回类型 + var underlyingType = isGenericType ? returnType.GenericTypeArguments.First() : returnType; + + var resultType = typeof(List<>).MakeGenericType(underlyingType); + var list = Activator.CreateInstance(resultType); + var addMethod = resultType.GetMethod("Add"); + + // 将 DataTable 转为行集合 + var dataRows = dataTable.AsEnumerable(); + + // 如果是基元类型 + if (underlyingType.IsRichPrimitive()) + { + // 遍历所有行 + foreach (var dataRow in dataRows) + { + // 只取第一列数据 + var firstColumnValue = dataRow[0]; + // 转换成目标类型数据 + var destValue = firstColumnValue?.ChangeType(underlyingType); + // 添加到集合中 + _ = addMethod.Invoke(list, new[] { destValue }); + } + } + // 处理Object类型 + else if (underlyingType == typeof(object)) + { + // 获取所有列名 + var columns = dataTable.Columns; + + // 遍历所有行 + foreach (var dataRow in dataRows) + { + var dic = new Dictionary(); + foreach (DataColumn column in columns) + { + dic.Add(column.ColumnName, dataRow[column]); + } + _ = addMethod.Invoke(list, new[] { dic }); + } + } + else + { + // 获取所有的数据列和类公开实例属性 + var dataColumns = dataTable.Columns; + var properties = underlyingType.GetProperties(BindingFlags.Public | BindingFlags.Instance); + //.Where(p => !p.IsDefined(typeof(NotMappedAttribute), true)); // sql 数据转换无需判断 [NotMapperd] 特性 + + // 遍历所有行 + foreach (var dataRow in dataRows) + { + var model = Activator.CreateInstance(underlyingType); + + // 遍历所有属性并一一赋值 + foreach (var property in properties) + { + // 获取属性对应的真实列名 + var columnName = property.Name; + if (property.IsDefined(typeof(ColumnAttribute), true)) + { + var columnAttribute = property.GetCustomAttribute(true); + if (!string.IsNullOrWhiteSpace(columnAttribute.Name)) columnName = columnAttribute.Name; + } + + // 如果 DataTable 不包含该列名，则跳过 + if (!dataColumns.Contains(columnName)) continue; + + // 获取列值 + var columnValue = dataRow[columnName]; + // 如果列值未空，则跳过 + if (columnValue == DBNull.Value) continue; + + // 转换成目标类型数据 + var destValue = columnValue?.ChangeType(property.PropertyType); + property.SetValue(model, destValue); + } + + // 添加到集合中 + _ = addMethod.Invoke(list, new[] { model }); + } + } + + return list; + } + + /// + /// 将 DataTable 转 特定类型 + /// + /// DataTable + /// 返回值类型 + /// object + public static Task ToListAsync(this DataTable dataTable, Type returnType) + { + return Task.FromResult(dataTable.ToList(returnType)); + } + + /// + /// 处理元组类型返回值 + /// + /// 数据集 + /// 返回值类型 + /// + internal static object ToValueTuple(this DataSet dataSet, Type tupleType) + { + // 获取元组最底层类型 + var underlyingTypes = tupleType.GetGenericArguments().Select(u => u.IsGenericType ? u.GetGenericArguments().First() : u); + + var toListMethod = typeof(DbDataConvertExtensions) + .GetMethods(BindingFlags.Public | BindingFlags.Static) + .First(u => u.Name == "ToList" && u.IsGenericMethod && u.GetGenericArguments().Length == tupleType.GetGenericArguments().Length) + .MakeGenericMethod(underlyingTypes.ToArray()); + + return toListMethod.Invoke(null, new[] { dataSet }); + } + } +} \ No newline at end of file diff --git a/Infrastructure/Extensions/ObjectExtension.cs b/Infrastructure/Extensions/ObjectExtension.cs index a61d56f8..6f55cfec 100644 --- a/Infrastructure/Extensions/ObjectExtension.cs +++ b/Infrastructure/Extensions/ObjectExtension.cs @@ -1,14 +1,18 @@ using System; using System.Collections; using System.Collections.Generic; +using System.ComponentModel; using System.Data; using System.IO; using System.Linq; using System.Linq.Expressions; using System.Reflection; +using System.Runtime.CompilerServices; using System.Runtime.Serialization.Formatters.Binary; using System.Text; using System.Text.RegularExpressions; +using System.Threading; +using System.Threading.Tasks; using System.Web; using System.Xml; using System.Xml.Linq; @@ -138,39 +142,41 @@ namespace Infrastructure.Extensions return objectList; } - - public static object ChangeType(this object convertibleValue, Type type) - { - if (null == convertibleValue) return null; - - try - { - if (type == typeof(Guid) || type == typeof(Guid?)) - { - string value = convertibleValue.ToString(); - if (value == "") return null; - return Guid.Parse(value); - } - - if (!type.IsGenericType) return Convert.ChangeType(convertibleValue, type); - if (type.ToString() == "System.Nullable`1[System.Boolean]" || type.ToString() == "System.Boolean") - { - if (convertibleValue.ToString() == "0") - return false; - return true; - } - Type genericTypeDefinition = type.GetGenericTypeDefinition(); - if (genericTypeDefinition == typeof(Nullable<>)) - { - return Convert.ChangeType(convertibleValue, Nullable.GetUnderlyingType(type)); - } - } - catch - { - return null; - } - return null; - } + // + // public static object ChangeType(this object convertibleValue, Type type) + // { + // if (null == convertibleValue) return null; + // + // try + // { + // if (type == typeof(Guid) || type == typeof(Guid?)) + // { + // string value = convertibleValue.ToString(); + // if (value == "") return null; + // return Guid.Parse(value); + // } + // + // if (!type.IsGenericType) return Convert.ChangeType(convertibleValue, type); + // if (type.ToString() == "System.Nullable`1[System.Boolean]" || type.ToString() == "System.Boolean") + // { + // if (convertibleValue.ToString() == "0") + // return false; + // return true; + // } + // Type genericTypeDefinition = type.GetGenericTypeDefinition(); + // if (genericTypeDefinition == typeof(Nullable<>)) + // { + // return Convert.ChangeType(convertibleValue, Nullable.GetUnderlyingType(type)); + // } + // } + // catch + // { + // return null; + // } + // return null; + // } + + /// /// 将集合转换为数据集。 /// @@ -1193,6 +1199,269 @@ namespace Infrastructure.Extensions { return EmailRegex.IsMatch(email); } + + + /// + /// 将 DateTimeOffset 转换成 DateTime + /// + /// + /// + public static DateTime ConvertToDateTime(this DateTimeOffset dateTime) + { + if (dateTime.Offset.Equals(TimeSpan.Zero)) + return dateTime.UtcDateTime; + else if (dateTime.Offset.Equals(TimeZoneInfo.Local.GetUtcOffset(dateTime.DateTime))) + return DateTime.SpecifyKind(dateTime.DateTime, DateTimeKind.Local); + else + return dateTime.DateTime; + } + + /// + /// 将 DateTime 转换成 DateTimeOffset + /// + /// + /// + public static DateTimeOffset ConvertToDateTimeOffset(this DateTime dateTime) + { + return DateTime.SpecifyKind(dateTime, DateTimeKind.Local); + } + + /// + /// 判断是否是富基元类型 + /// + /// 类型 + /// + internal static bool IsRichPrimitive(this Type type) + { + // 处理元组类型 + if (type.IsValueTuple()) return false; + + // 处理数组类型，基元数组类型也可以是基元类型 + if (type.IsArray) return type.GetElementType().IsRichPrimitive(); + + // 基元类型或值类型或字符串类型 + if (type.IsPrimitive || type.IsValueType || type == typeof(string)) return true; + + if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>)) return type.GenericTypeArguments[0].IsRichPrimitive(); + + return false; + } + + /// + /// 合并两个字典 + /// + /// + /// 字典 + /// 新字典 + /// + internal static Dictionary AddOrUpdate(this Dictionary dic, Dictionary newDic) + { + foreach (var key in newDic.Keys) + { + if (dic.ContainsKey(key)) + dic[key] = newDic[key]; + else + dic.Add(key, newDic[key]); + } + + return dic; + } + + /// + /// 判断是否是元组类型 + /// + /// 类型 + /// + internal static bool IsValueTuple(this Type type) + { + return type.ToString().StartsWith(typeof(ValueTuple).FullName); + } + + /// + /// 判断方法是否是异步 + /// + /// 方法 + /// + internal static bool IsAsync(this MethodInfo method) + { + return method.ReturnType.IsAsync(); + } + + /// + /// 判断类型是否是异步类型 + /// + /// + /// + internal static bool IsAsync(this Type type) + { + return type.ToString().StartsWith(typeof(Task).FullName); + } + + /// + /// 判断类型是否实现某个泛型 + /// + /// 类型 + /// 泛型类型 + /// bool + internal static bool HasImplementedRawGeneric(this Type type, Type generic) + { + // 检查接口类型 + var isTheRawGenericType = type.GetInterfaces().Any(IsTheRawGenericType); + if (isTheRawGenericType) return true; + + // 检查类型 + while (type != null && type != typeof(object)) + { + isTheRawGenericType = IsTheRawGenericType(type); + if (isTheRawGenericType) return true; + type = type.BaseType; + } + + return false; + + // 判断逻辑 + bool IsTheRawGenericType(Type type) => generic == (type.IsGenericType ? type.GetGenericTypeDefinition() : type); + } + + /// + /// 判断是否是匿名类型 + /// + /// 对象 + /// + internal static bool IsAnonymous(this object obj) + { + var type = obj.GetType(); + + return Attribute.IsDefined(type, typeof(CompilerGeneratedAttribute), false) + && type.IsGenericType && type.Name.Contains("AnonymousType") + && (type.Name.StartsWith("<>") || type.Name.StartsWith("VB$")) + && type.Attributes.HasFlag(TypeAttributes.NotPublic); + } + + /// + /// 获取所有祖先类型 + /// + /// + /// + internal static IEnumerable GetAncestorTypes(this Type type) + { + var ancestorTypes = new List(); + while (type != null && type != typeof(object)) + { + if (IsNoObjectBaseType(type)) + { + var baseType = type.BaseType; + ancestorTypes.Add(baseType); + type = baseType; + } + else break; + } + + return ancestorTypes; + + static bool IsNoObjectBaseType(Type type) => type.BaseType != typeof(object); + } + + /// + /// 获取方法真实返回类型 + /// + /// + /// + internal static Type GetRealReturnType(this MethodInfo method) + { + // 判断是否是异步方法 + var isAsyncMethod = method.IsAsync(); + + // 获取类型返回值并处理 Task 和 Task 类型返回值 + var returnType = method.ReturnType; + return isAsyncMethod ? (returnType.GenericTypeArguments.FirstOrDefault() ?? typeof(void)) : returnType; + } + + /// + /// 首字母大写 + /// + /// + /// + internal static string ToTitleCase(this string str) + { + return Thread.CurrentThread.CurrentCulture.TextInfo.ToTitleCase(str); + } + + /// + /// 将一个对象转换为指定类型 + /// + /// + /// + /// + internal static T ChangeType(this object obj) + { + return (T)ChangeType(obj, typeof(T)); + } + + /// + /// 将一个对象转换为指定类型 + /// + /// 待转换的对象 + /// 目标类型 + /// 转换后的对象 + internal static object ChangeType(this object obj, Type type) + { + if (type == null) return obj; + if (obj == null) return type.IsValueType ? Activator.CreateInstance(type) : null; + + var underlyingType = Nullable.GetUnderlyingType(type); + if (type.IsAssignableFrom(obj.GetType())) return obj; + else if ((underlyingType ?? type).IsEnum) + { + if (underlyingType != null && string.IsNullOrWhiteSpace(obj.ToString())) return null; + else return Enum.Parse(underlyingType ?? type, obj.ToString()); + } + // 处理DateTime -> DateTimeOffset 类型 + else if (obj.GetType().Equals(typeof(DateTime)) && (underlyingType ?? type).Equals(typeof(DateTimeOffset))) + { + return ((DateTime)obj).ConvertToDateTimeOffset(); + } + // 处理 DateTimeOffset -> DateTime 类型 + else if (obj.GetType().Equals(typeof(DateTimeOffset)) && (underlyingType ?? type).Equals(typeof(DateTime))) + { + return ((DateTimeOffset)obj).ConvertToDateTime(); + } + else if (typeof(IConvertible).IsAssignableFrom(underlyingType ?? type)) + { + try + { + return Convert.ChangeType(obj, underlyingType ?? type, null); + } + catch + { + return underlyingType == null ? Activator.CreateInstance(type) : null; + } + } + else + { + var converter = TypeDescriptor.GetConverter(type); + if (converter.CanConvertFrom(obj.GetType())) return converter.ConvertFrom(obj); + + var constructor = type.GetConstructor(Type.EmptyTypes); + if (constructor != null) + { + var o = constructor.Invoke(null); + var propertys = type.GetProperties(); + var oldType = obj.GetType(); + + foreach (var property in propertys) + { + var p = oldType.GetProperty(property.Name); + if (property.CanWrite && p != null && p.CanRead) + { + property.SetValue(o, ChangeType(p.GetValue(obj, null), property.PropertyType), null); + } + } + return o; + } + } + return obj; + } } diff --git a/OpenAuth.App/Extensions/OpenJobExt.cs b/OpenAuth.App/Extensions/OpenJobExt.cs new file mode 100644 index 00000000..032f07c6 --- /dev/null +++ b/OpenAuth.App/Extensions/OpenJobExt.cs @@ -0,0 +1,55 @@ +using System; +using System.Linq; +using Infrastructure; +using OpenAuth.Repository.Domain; +using Quartz; + +namespace OpenAuth.App.Extensions +{ + /// + /// 定时任务扩展 + /// + public static class OpenJobExt + { + /// + /// 启动定时任务 + /// + /// + /// 一个Quartz Scheduler + public static void Start(this OpenJob job, IScheduler scheduler) + { + var jobBuilderType = typeof(JobBuilder); + var method = jobBuilderType.GetMethods().FirstOrDefault( + x => x.Name.Equals("Create", StringComparison.OrdinalIgnoreCase) && + x.IsGenericMethod && x.GetParameters().Length == 0) + ?.MakeGenericMethod(Type.GetType(job.JobCall)); + + var jobBuilder = (JobBuilder) method.Invoke(null, null); + + IJobDetail jobDetail = jobBuilder.WithIdentity(job.Id).Build(); + jobDetail.JobDataMap[Define.JOBMAPKEY] = job.Id; //传递job信息 + ITrigger trigger = TriggerBuilder.Create() + .WithCronSchedule(job.Cron) + .WithIdentity(job.Id) + .StartNow() + .Build(); + scheduler.ScheduleJob(jobDetail, trigger); + } + + /// + /// 停止一个定时任务 + /// + /// + /// + public static void Stop(this OpenJob job, IScheduler scheduler) + { + TriggerKey triggerKey = new TriggerKey(job.Id); + // 停止触发器 + scheduler.PauseTrigger(triggerKey); + // 移除触发器 + scheduler.UnscheduleJob(triggerKey); + // 删除任务 + scheduler.DeleteJob(new JobKey(job.Id)); + } + } +} \ No newline at end of file diff --git a/OpenAuth.App/HostedService/QuartzService.cs b/OpenAuth.App/HostedService/QuartzService.cs index 36a2f036..3ceb564f 100644 --- a/OpenAuth.App/HostedService/QuartzService.cs +++ b/OpenAuth.App/HostedService/QuartzService.cs @@ -11,17 +11,19 @@ namespace OpenAuth.App.HostedService { private readonly ILogger _logger; private IScheduler _scheduler; + private OpenJobApp _openJobApp; - public QuartzService(ILogger logger, IScheduler scheduler) + public QuartzService(ILogger logger, IScheduler scheduler, OpenJobApp openJobApp) { _logger = logger; _scheduler = scheduler; + _openJobApp = openJobApp; } public Task StartAsync(CancellationToken cancellationToken) { - _logger.LogInformation("启动定时job，可以在这里配置读取数据库需要启动的任务，然后启动他们"); _scheduler.Start(); + _openJobApp.StartAll(); return Task.CompletedTask; } diff --git a/OpenAuth.App/Jobs/OpenJobApp.cs b/OpenAuth.App/Jobs/OpenJobApp.cs index bdd2e61b..d64cd9cf 100644 --- a/OpenAuth.App/Jobs/OpenJobApp.cs +++ b/OpenAuth.App/Jobs/OpenJobApp.cs @@ -3,7 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Infrastructure; +using Infrastructure.Const; using Microsoft.Extensions.Logging; +using OpenAuth.App.Extensions; using OpenAuth.App.Interface; using OpenAuth.App.Jobs; using OpenAuth.App.Request; @@ -16,6 +18,9 @@ using Quartz; namespace OpenAuth.App { + /// + /// 系统定时任务管理 + /// public class OpenJobApp : BaseStringApp { private SysLogApp _sysLogApp; @@ -41,10 +46,25 @@ namespace OpenAuth.App return result; } + /// + /// 启动所有状态为正在运行的任务 + /// 通常应用在系统加载的时候 + /// + /// + public async Task StartAll() + { + var jobs = Repository.Find(u => u.Status == (int) JobStatus.Running); + foreach (var job in jobs) + { + job.Start(_scheduler); + } + _logger.LogInformation("所有状态为正在运行的任务已启动"); + + } + public void Add(AddOrUpdateOpenJobReq req) { var obj = req.MapTo(); - //todo:补充或调整自己需要的字段 obj.CreateTime = DateTime.Now; var user = _auth.GetCurrentUser().User; obj.CreateUserId = user.Id; @@ -67,12 +87,11 @@ namespace OpenAuth.App UpdateTime = DateTime.Now, UpdateUserId = user.Id, UpdateUserName = user.Name - //todo:补充或调整自己需要的字段 }); } #region 定时任务运行相关操作 - + /// /// 返回系统的job接口 /// @@ -85,7 +104,7 @@ namespace OpenAuth.App .ToArray(); return types.Select(u => u.FullName).ToList(); } - + public void ChangeJobStatus(ChangeJobStatusReq req) { var job = Repository.FirstOrDefault(u => u.Id == req.Id); @@ -93,40 +112,18 @@ namespace OpenAuth.App { throw new Exception("任务不存在"); } - - - if (req.Status == 0) //停止 - { - TriggerKey triggerKey = new TriggerKey(job.Id); - // 停止触发器 - _scheduler.PauseTrigger(triggerKey); - // 移除触发器 - _scheduler.UnscheduleJob(triggerKey); - // 删除任务 - _scheduler.DeleteJob(new JobKey(job.Id)); - } - else //启动 - { - var jobBuilderType = typeof(JobBuilder); - var method = jobBuilderType.GetMethods().FirstOrDefault( - x => x.Name.Equals("Create", StringComparison.OrdinalIgnoreCase) && - x.IsGenericMethod && x.GetParameters().Length == 0) - ?.MakeGenericMethod(Type.GetType(job.JobCall)); - var jobBuilder = (JobBuilder)method.Invoke(null, null); - - IJobDetail jobDetail = jobBuilder.WithIdentity(job.Id).Build(); - jobDetail.JobDataMap[Define.JOBMAPKEY] = job.Id; //传递job信息 - ITrigger trigger = TriggerBuilder.Create() - .WithCronSchedule(job.Cron) - .WithIdentity(job.Id) - .StartNow() - .Build(); - _scheduler.ScheduleJob(jobDetail, trigger); + if (req.Status == (int) JobStatus.NotRun) //停止 + { + job.Stop(_scheduler); } - - + else //启动 + { + job.Start(_scheduler); + } + + var user = _auth.GetCurrentUser().User; job.Status = req.Status; @@ -135,14 +132,13 @@ namespace OpenAuth.App job.UpdateUserName = user.Name; Repository.Update(job); } - /// /// 记录任务运行结果 /// /// public void RecordRun(string jobId) { - var job = Repository.FirstOrDefault(u =>u.Id == jobId); + var job = Repository.FirstOrDefault(u => u.Id == jobId); if (job == null) { _sysLogApp.Add(new SysLog @@ -157,7 +153,7 @@ namespace OpenAuth.App job.RunCount++; job.LastRunTime = DateTime.Now; Repository.Update(job); - + _sysLogApp.Add(new SysLog { CreateName = "Quartz", @@ -172,13 +168,13 @@ namespace OpenAuth.App #endregion - public OpenJobApp(IUnitWork unitWork, IRepository repository, - IAuth auth, SysLogApp sysLogApp, IScheduler scheduler, ILogger logger) : base(unitWork, repository, auth) + public OpenJobApp(IUnitWork unitWork, IRepository repository, + IAuth auth, SysLogApp sysLogApp, IScheduler scheduler, ILogger logger) : base(unitWork, + repository, auth) { _sysLogApp = sysLogApp; _scheduler = scheduler; _logger = logger; } - } } \ No newline at end of file diff --git a/OpenAuth.Repository/Interface/IUnitWork.cs b/OpenAuth.Repository/Interface/IUnitWork.cs index d85b2e21..ecee9906 100644 --- a/OpenAuth.Repository/Interface/IUnitWork.cs +++ b/OpenAuth.Repository/Interface/IUnitWork.cs @@ -10,6 +10,8 @@ // *********************************************************************** using System; +using System.Collections.Generic; +using System.Data.Common; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; @@ -107,6 +109,13 @@ namespace OpenAuth.Repository.Interface /// IQueryable Query(string sql, params object[] parameters) where T : class; + /// + /// 执行存储过程 + /// + /// 存储过程名称 + /// 存储过程参数 + List ExecProcedure(string procName,params DbParameter[] sqlParams) where T : class; + #region 异步接口 Task ExecuteSqlRawAsync(string sql); diff --git a/OpenAuth.Repository/OpenAuthDBContext.cs b/OpenAuth.Repository/OpenAuthDBContext.cs index 959c188f..f0968e0c 100644 --- a/OpenAuth.Repository/OpenAuthDBContext.cs +++ b/OpenAuth.Repository/OpenAuthDBContext.cs @@ -21,16 +21,14 @@ namespace OpenAuth.Repository private ILoggerFactory _LoggerFactory; private IHttpContextAccessor _httpContextAccessor; private IConfiguration _configuration; - private IOptions _appConfiguration; public OpenAuthDBContext(DbContextOptions options, ILoggerFactory loggerFactory, - IHttpContextAccessor httpContextAccessor, IConfiguration configuration, IOptions appConfiguration) + IHttpContextAccessor httpContextAccessor, IConfiguration configuration) : base(options) { _LoggerFactory = loggerFactory; _httpContextAccessor = httpContextAccessor; _configuration = configuration; - _appConfiguration = appConfiguration; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) diff --git a/OpenAuth.Repository/Test/TestUnitWork.cs b/OpenAuth.Repository/Test/TestUnitWork.cs new file mode 100644 index 00000000..af8a28da --- /dev/null +++ b/OpenAuth.Repository/Test/TestUnitWork.cs @@ -0,0 +1,28 @@ +using System; +using System.Linq; +using Infrastructure; +using NUnit.Framework; +using Microsoft.Extensions.DependencyInjection; +using OpenAuth.Repository.Domain; +using OpenAuth.Repository.Interface; + +namespace OpenAuth.Repository.Test +{ + /// + /// 测试UnitWork + /// + class TestUnitWork : TestBase + { + /// + /// 测试存储过程 + /// + [Test] + public void ExecProcedure() + { + var unitWork = _autofacServiceProvider.GetService>(); + var users = unitWork.ExecProcedure("sp_alluser"); + Console.WriteLine(JsonHelper.Instance.Serialize(users)); + } + + } +} \ No newline at end of file diff --git a/OpenAuth.Repository/UnitWork.cs b/OpenAuth.Repository/UnitWork.cs index b1d51f5a..0b2b1597 100644 --- a/OpenAuth.Repository/UnitWork.cs +++ b/OpenAuth.Repository/UnitWork.cs @@ -1,9 +1,13 @@ using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.Data; +using System.Data.Common; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; using Infrastructure; +using Infrastructure.Database; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage; using OpenAuth.Repository.Core; @@ -212,8 +216,29 @@ namespace OpenAuth.Repository { return _context.Query().FromSqlRaw(sql, parameters); } - - #region 异步实现 + + /// + /// 执行存储过程 + /// + /// 存储过程名称 + /// 存储过程参数 + public List ExecProcedure(string procName, params DbParameter[] sqlParams) where T : class + { + var connection = _context.Database.GetDbConnection(); + using (var cmd = connection.CreateCommand()) + { + _context.Database.OpenConnection(); + cmd.CommandText = procName; + cmd.CommandType = CommandType.StoredProcedure; + cmd.Parameters.AddRange(sqlParams); + DbDataReader dr = cmd.ExecuteReader(); + var datatable = new DataTable(); + datatable.Load(dr); + return datatable.ToList(); + } + } + + #region 异步实现 /// /// 异步执行sql