1

xiazhengtongxue

3 天以前 5b34a1458e74f8902d01ebd844c2954f554c9e74

 Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs

@@ -16,6 +16,7 @@
using WIDESEA_Core.DB.Models;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;

//using WIDESEA_Core.HostedService;
using WIDESEA_Core.Utilities;
using ICacheService = WIDESEA_Core.Caches.ICacheService;
@@ -36,7 +37,53 @@

        public ISqlSugarClient Db => BaseDal.Db;

        protected async Task<WebResponseContent> ExecuteWithinTransactionAsync(Func<Task<WebResponseContent>> operation)
        {
            var db = Db as SqlSugarClient;
            if (db == null)
            {
                return WebResponseContent.Instance.Error("Database context does not support transactions");
            }

            var ownsTransaction = db.Ado.Transaction == null;
            try
            {
                if (ownsTransaction)
                {
                    db.BeginTran();
                }

                var result = await operation();
                if (result?.Status == true)
                {
                    if (ownsTransaction)
                    {
                        db.CommitTran();
                    }

                    return result;
                }

                if (ownsTransaction)
                {
                    db.RollbackTran();
                }

                return result ?? WebResponseContent.Instance.Error("Transaction failed");
            }
            catch
            {
                if (ownsTransaction)
                {
                    db.RollbackTran();
                }

                throw;
            }
        }

        private PropertyInfo[] _propertyInfo { get; set; } = null;

        public PropertyInfo[] TProperties
        {
            get
@@ -156,7 +203,6 @@
            string? value = propertyValue?.ToString();
            if (value == null) return p => true;


            parameter = parameter ?? Expression.Parameter(typeof(TEntity), "x");
            //创建节点的属性p=>p.name 属性name
            MemberExpression memberProperty = Expression.PropertyOrField(parameter, propertyName);
@@ -229,21 +275,27 @@
                case LinqExpressionType.Equal:
                    expression = Expression.Lambda<Func<TEntity, bool>>(Expression.Equal(member, constant), parameter);
                    break;

                case LinqExpressionType.NotEqual:
                    expression = Expression.Lambda<Func<TEntity, bool>>(Expression.NotEqual(member, constant), parameter);
                    break;

                case LinqExpressionType.GreaterThan:
                    expression = Expression.Lambda<Func<TEntity, bool>>(Expression.GreaterThan(member, constant), parameter);
                    break;

                case LinqExpressionType.LessThan:
                    expression = Expression.Lambda<Func<TEntity, bool>>(Expression.LessThan(member, constant), parameter);
                    break;

                case LinqExpressionType.ThanOrEqual:
                    expression = Expression.Lambda<Func<TEntity, bool>>(Expression.GreaterThanOrEqual(member, constant), parameter);
                    break;

                case LinqExpressionType.LessThanOrEqual:
                    expression = Expression.Lambda<Func<TEntity, bool>>(Expression.LessThanOrEqual(member, constant), parameter);
                    break;

                case LinqExpressionType.Contains:
                case LinqExpressionType.NotContains:
                    MethodInfo? method = typeof(string).GetMethod("Contains", new[] { typeof(string) });
@@ -264,6 +316,7 @@
                        expression = p => true;
                    }
                    break;

                default:
                    expression = p => false;
                    break;
@@ -301,8 +354,6 @@
            }
            return new Dictionary<string, OrderByType> { { "CreateDate", pageData.Order?.ToLower() == OrderByType.Asc.ToString() ? OrderByType.Asc : OrderByType.Desc } };
        }



        //private string GetDataRole(Type type)
        //{
@@ -676,7 +727,6 @@
                {
                    content = WebResponseContent.Instance.Error("未找到主表主键值");
                }

            }
            catch (Exception ex)
            {
@@ -919,4 +969,4 @@
            return content;
        }
    }
}
}