update page查询新增动态参数查询(Dapper)

Api/Ewide.Application/Service/HouseCode/HouseCodeService.cs

@@ -64,14 +64,17 @@ namespace Ewide.Application.Service.HouseCode
         }
 
         [HttpPost("/houseCode/page")]
+        [Microsoft.AspNetCore.Authorization.AllowAnonymous]
         public async Task<dynamic> QueryPage([FromBody] QueryHouseCodeInput input)
         {
             var sql = @"SELECT HC.*,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,Proj.AreaCode,Proj.Note,Proj.Name+'('+Proj.Note+')' FullProjName FROM bs_house_code HC
 LEFT JOIN bs_house_projectinfo Proj ON Proj.Id=HC.ProjectId
 LEFT JOIN sys_area_code CA ON CA.Code = Proj.AreaCode
 LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
-LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6) WHERE HC.Address LIKE @Address AND HC.HouseCode LIKE @HouseCode";
+LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6) ";
-            return await _dapperRepository.QueryPageData(sql, input, param: new { Address = '%' + input.Address + '%', HouseCode = '%' + input.HouseCode + '%'});
+//WHERE HC.Address LIKE @Address AND HC.HouseCode LIKE @HouseCode";
+            //return await _dapperRepository.QueryPageData(sql, input, param: new { Address = '%' + input.Address + '%', HouseCode = '%' + input.HouseCode + '%'});
+            return await _dapperRepository.QueryPageDataDynamic(sql, input);
         }
 
         /// <summary>

Api/Ewide.Core/Enum/QueryTypeEnum.cs

@@ -11,48 +11,48 @@ namespace Ewide.Core
         /// 等于
         /// </summary>
         [Description("等于")]
-        eq = 0,
+        Equal = 0,
 
         /// <summary>
         /// 模糊
         /// </summary>
         [Description("模糊")]
-        like = 1,
+        Like = 1,
 
         /// <summary>
         /// 大于
         /// </summary>
         [Description("大于")]
-        gt = 2,
+        GreaterThan = 2,
 
         /// <summary>
         /// 小于
         /// </summary>
         [Description("小于")]
-        lt = 3,
+        LessThan = 3,
 
         /// <summary>
         /// 不等于
         /// </summary>
         [Description("不等于")]
-        ne = 4,
+        NotEqual = 4,
 
         /// <summary>
         /// 大于等于
         /// </summary>
         [Description("大于等于")]
-        ge = 5,
+        GreaterThanOrEqual = 5,
 
         /// <summary>
         /// 小于等于
         /// </summary>
         [Description("小于等于")]
-        le = 6,
+        LessThanOrEqual = 6,
 
         /// <summary>
         /// 不为空
         /// </summary>
         [Description("不为空")]
-        isNotNull = 7
+        IsNotNull = 7
     }
 }

Api/Ewide.Core/Ewide.Core.xml

@@ -2447,42 +2447,42 @@
             查询类型的枚举
             </summary>
         </member>
-        <member name="F:Ewide.Core.QueryTypeEnum.eq">
+        <member name="F:Ewide.Core.QueryTypeEnum.Equal">
             <summary>
             等于
             </summary>
         </member>
-        <member name="F:Ewide.Core.QueryTypeEnum.like">
+        <member name="F:Ewide.Core.QueryTypeEnum.Like">
             <summary>
             模糊
             </summary>
         </member>
-        <member name="F:Ewide.Core.QueryTypeEnum.gt">
+        <member name="F:Ewide.Core.QueryTypeEnum.GreaterThan">
             <summary>
             大于
             </summary>
         </member>
-        <member name="F:Ewide.Core.QueryTypeEnum.lt">
+        <member name="F:Ewide.Core.QueryTypeEnum.LessThan">
             <summary>
             小于
             </summary>
         </member>
-        <member name="F:Ewide.Core.QueryTypeEnum.ne">
+        <member name="F:Ewide.Core.QueryTypeEnum.NotEqual">
             <summary>
             不等于
             </summary>
         </member>
-        <member name="F:Ewide.Core.QueryTypeEnum.ge">
+        <member name="F:Ewide.Core.QueryTypeEnum.GreaterThanOrEqual">
             <summary>
             大于等于
             </summary>
         </member>
-        <member name="F:Ewide.Core.QueryTypeEnum.le">
+        <member name="F:Ewide.Core.QueryTypeEnum.LessThanOrEqual">
             <summary>
             小于等于
             </summary>
         </member>
-        <member name="F:Ewide.Core.QueryTypeEnum.isNotNull">
+        <member name="F:Ewide.Core.QueryTypeEnum.IsNotNull">
             <summary>
             不为空
             </summary>
@@ -2502,6 +2502,42 @@
             否
             </summary>
         </member>
+        <member name="F:Ewide.Core.Extension.DataFilter.Entity.FilterInfo._SearchInfos">
+            <summary>
+            查询信息集合
+            </summary>
+        </member>
+        <member name="P:Ewide.Core.Extension.DataFilter.Entity.FilterInfo.SearchInfos">
+            <summary>
+            高级查询信息集合
+            </summary>
+        </member>
+        <member name="M:Ewide.Core.Extension.DataFilter.Entity.FilterInfo.SetSearchInfo(Ewide.Core.SearchInfo[])">
+            <summary>
+            设置查询信息
+            </summary>
+            <param name="searchJson"></param>
+        </member>
+        <member name="P:Ewide.Core.SearchInfo.Field">
+            <summary>
+            字段名
+            </summary>
+        </member>
+        <member name="P:Ewide.Core.SearchInfo.Value">
+            <summary>
+            查询多个条件
+            </summary>
+        </member>
+        <member name="P:Ewide.Core.SearchInfo.QueryTypeStr">
+            <summary>
+            查询运算符
+            </summary>
+        </member>
+        <member name="M:Ewide.Core.SearchInfo.#ctor">
+            <summary>
+            构造函数
+            </summary>
+        </member>
         <member name="T:Ewide.Core.DictionaryExtensions">
             <summary>
             字典扩展
@@ -2598,6 +2634,11 @@
             降序排序(不要问我为什么是descend不是desc，前端约定参数就是这样)
             </summary>
         </member>
+        <member name="P:Ewide.Core.PageInputBase._Search">
+            <summary>
+            查询条件 
+            </summary>
+        </member>
         <member name="T:Ewide.Core.PageDataResult`1">
             <summary>
             小诺分页列表结果

Api/Ewide.Core/Extension/DataFilter/Entity/FilterInfo.cs

@@ -0,0 +1,65 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Core.Extension.DataFilter.Entity
+{
+    public class FilterInfo
+    {
+		/// <summary>
+		/// 查询信息集合
+		/// </summary>
+		private List<SearchInfo> _SearchInfos;
+
+		/// <summary>
+		/// 高级查询信息集合
+		/// </summary>
+		public List<SearchInfo> SearchInfos
+		{
+			get { return _SearchInfos; }
+		}
+
+		public FilterInfo()
+		{
+			_SearchInfos = new List<SearchInfo>();
+		}
+
+		/// <summary>
+		/// 设置查询信息
+		/// </summary>
+		/// <param name="searchJson"></param>
+		public void SetSearchInfo(SearchInfo[] searchJson)
+		{
+			try
+			{
+				foreach (var elem in searchJson)
+				{
+					var fieldName = elem.Field;
+					var searchStrs = elem.Value;
+					if (searchStrs == null) continue;
+					if (searchStrs.Count == 0) continue;
+
+					var searchInfo = new SearchInfo();
+					searchInfo.Field = fieldName;
+					searchInfo.QueryTypeStr = elem.QueryTypeStr;
+					var searchStrsNode = elem.Value;
+					if (searchStrsNode != null)
+					{
+                        foreach (var node in searchStrsNode)
+                        {
+							searchInfo.Value.Add(node);
+                        }
+                    }
+					_SearchInfos.Add(searchInfo);
+				}
+			}
+			catch
+			{
+			}
+		}
+	}
+}

Api/Ewide.Core/Extension/DataFilter/Entity/SearchInfo.cs

@@ -0,0 +1,66 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Core
+{
+    public class SearchInfo
+    {
+        
+        /// <summary>
+        /// 字段名
+        /// </summary>
+        public string Field { get; set; }
+
+        /// <summary>
+        /// 查询多个条件
+        /// </summary>
+        public List<string> Value { get; set; }
+
+        /// <summary>
+        /// 查询运算符
+        /// </summary>
+        public string QueryTypeStr { get; set; }
+
+        private string _QueryTypeStr;
+        
+        public QueryTypeEnum QueryType
+        {
+            get
+            {
+                switch (_QueryTypeStr)
+                {
+                    case "=":
+                    case "equal":
+                        return  QueryTypeEnum.Equal;
+                    case "<":
+                    case "lessthan":
+                        return  QueryTypeEnum.LessThan;
+                    case "<=":
+                    case "lessthanorequal":
+                        return QueryTypeEnum.LessThanOrEqual;
+                    case ">":
+                    case "greaterthan":
+                        return QueryTypeEnum.GreaterThan;
+                    case ">=":
+                    case "greaterthanorequal":
+                        return QueryTypeEnum.GreaterThanOrEqual;
+                    default:
+                        return QueryTypeEnum.Like;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public SearchInfo()
+        {
+            Value = new List<string>();
+            _QueryTypeStr = QueryTypeStr;
+        }
+    }
+}

Api/Ewide.Core/Extension/DataFilter/IDataFilterSqlStringBuilderService.cs

@@ -0,0 +1,9 @@
+using Dapper;
+
+namespace Ewide.Core.Extension.DataFilter
+{
+    public interface IDataFilterSqlStringBuilderService
+    {
+        DynamicParameters[] GetDataParameter();
+    }
+}

Api/Ewide.Core/Extension/DataFilter/IFitlerInfoGetService.cs

@@ -0,0 +1,14 @@
+using Ewide.Core.Extension.DataFilter.Entity;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Core.Extension.DataFilter
+{
+    public interface IFitlerInfoGetService
+    {
+        FilterInfo GetFilterInfo();
+    }
+}

Api/Ewide.Core/Extension/DataFilter/WebPage/SearchJsonFitlerInfoGetService.cs

@@ -0,0 +1,116 @@
+using Dapper;
+using Ewide.Core.Extension.DataFilter.Entity;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Core.Extension.DataFilter.WebPage
+{
+    public class SearchJsonFitlerInfoGetService : IFitlerInfoGetService
+    {
+        protected PageInputBase Input;
+        protected IEnumerable<string> EqualsFields;
+        protected IEnumerable<string> LikeFields;
+        protected IEnumerable<string> DateRangeFields;
+        protected IEnumerable<string> OtherRangeFields;
+        public DynamicParameters sqlParameters = new DynamicParameters();
+
+        public SearchJsonFitlerInfoGetService(PageInputBase input, IEnumerable<string> equalsFields, IEnumerable<string> likeFields, IEnumerable<string> dateRangeFields, IEnumerable<string> otherRangeFields)
+        {
+            Input = input;
+            EqualsFields = equalsFields;
+            LikeFields = likeFields;
+            DateRangeFields = dateRangeFields;
+            OtherRangeFields = otherRangeFields;
+        }
+
+
+        public FilterInfo GetFilterInfo()
+        {
+            var result = new FilterInfo();
+            result.SetSearchInfo(Input._Search);
+            return result;
+        }
+
+        public string GetWhereSql(string baseSql)
+        {
+            var filterInfo = GetFilterInfo();
+            baseSql = String.Format("SELECT * FROM ({0}) T ", baseSql);
+            var searchInfoList = filterInfo.SearchInfos;
+            if (searchInfoList.Count == 0)
+                return baseSql;
+            List<string> whereSqls = new List<string>();
+            foreach (var elem in searchInfoList.Where(m => m != null))
+            {
+                whereSqls.Add(GetWhereSqlBuild(elem));
+            }
+            StringBuilder result = new StringBuilder();
+
+            if (whereSqls.Count > 0)
+            {
+                result.Append(" WHERE ");
+                result.Append(String.Join(" AND ", whereSqls));
+            }
+            return baseSql + result.ToString();
+        }
+
+        public DynamicParameters GetParams()
+        {
+            return sqlParameters;
+        }
+
+        #region 私有方法
+        private string GetWhereSqlBuild(SearchInfo searchInfo)
+        {
+            string sqlT = "`{0}`{1}{2}";
+            List<string> whereList = new List<string>();
+            foreach (var elem in searchInfo.Value)
+            {
+                var parameterName = "@" + searchInfo.Field + Guid.NewGuid().ToString("N");
+                //AddParameter(parameterName, elem);
+                sqlParameters.Add(parameterName, QueryTypeEnum.Like == searchInfo.QueryType ? "%" + elem + "%" : elem);
+                whereList.Add(String.Format(sqlT, searchInfo.Field, GetSearchOperatorStr(searchInfo.QueryType), parameterName));
+            }
+            if (whereList.Count == 0) return String.Empty;
+            var resultT = "({0})";
+            var result = String.Format(resultT, String.Join(" OR ", whereList));
+            return result;
+        }
+
+       
+        private string GetSearchOperatorStr(QueryTypeEnum searchOperator)
+        {
+            switch (searchOperator)
+            {
+                case QueryTypeEnum.GreaterThan:
+                    return ">";
+                case QueryTypeEnum.GreaterThanOrEqual:
+                    return ">=";
+                case QueryTypeEnum.LessThan:
+                    return "<";
+                case QueryTypeEnum.LessThanOrEqual:
+                    return "<=";
+                case QueryTypeEnum.Like:
+                    return " LIKE ";
+                default:
+                    return "=";
+            }
+        }
+
+        private void AddParameter(string key, object value)
+        {
+            //var parameter = _SqlParameters.ParameterNames.FirstOrDefault(m => m == key);
+            //if (parameter != null)
+            //{
+            //    _SqlParameters.
+            //}
+            //else
+            //{
+            //    _SqlParameters.Add(key, value);
+            //}
+        }
+        #endregion
+    }
+}

Api/Ewide.Core/Extension/InputBase.cs

@@ -71,5 +71,11 @@ namespace Ewide.Core
         /// 降序排序(不要问我为什么是descend不是desc，前端约定参数就是这样)
         /// </summary>
         public virtual string DescStr => "descend";
+
+        /// <summary>
+        /// 查询条件 
+        /// </summary>
+        public virtual SearchInfo[] _Search { get; set; }
     }
+
 }

Api/Ewide.Core/Extension/PageExtensions.cs

@@ -1,11 +1,15 @@
 using Dapper;
+using Ewide.Core.Extension.DataFilter.WebPage;
 using Furion.DatabaseAccessor;
+using Furion.LinqBuilder;
 using Mapster;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Linq.Dynamic.Core;
+using System.Linq.Expressions;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Ewide.Core.Extension
@@ -41,6 +45,75 @@ namespace Ewide.Core.Extension
             return orderStr;
         }
 
+        //public static IQueryable<T> GetFilterInfo<T>(this IQueryable<T> source, PageInputBase input, IEnumerable<string> equalsFields = null, IEnumerable<string> likeFields = null, IEnumerable<string> dateTimeRangeFields = null, IEnumerable<string> otherRangeFields = null) where T : new()
+        //{
+        //    var _searchStr = input._Search;
+        //    var searchInfoObj = Newtonsoft.Json.JsonConvert.DeserializeObject<DataFilter.Entity.SearchInfo[]>(_searchStr);
+        //    foreach(var elem in searchInfoObj)
+        //    {
+        //        ParameterExpression param = Expression.Parameter(typeof(T), "p");
+        //        var field = typeof(T).GetProperty(elem.Field, BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase);
+        //        Expression left = Expression.Property(param, field);
+        //        Expression<Func<T, bool>> finalExpression = null;
+        //        foreach(var value in elem.Value) 
+        //        {
+        //            Expression right = Expression.Constant(Convert.ChangeType(value, Nullable.GetUnderlyingType(left.Type) ?? left.Type));
+        //            right = Expression.Convert(right, left.Type);
+
+        //            Expression filter = null;
+        //            filter = filter.Filter(left, right, elem.QueryType);
+
+        //            if (finalExpression == null)
+        //            {
+        //                finalExpression = Expression.Lambda<Func<T, bool>>(filter, param);
+        //            }
+        //            else
+        //            {
+        //                finalExpression = finalExpression.Or(Expression.Lambda<Func<T, bool>>(filter, param));
+        //            }
+        //        }
+        //        source.Where(finalExpression);
+        //    }
+        //    return source;
+        //}
+
+        private static Expression Filter(this Expression filter, Expression left, Expression right, Ewide.Core.QueryTypeEnum queryType)
+        {
+            switch (queryType)
+            {
+                //case "=":
+                //    filter = Expression.Equal(left, right);
+                //    break;
+                //case "<>":
+                //case "!=":
+                //    filter = Expression.NotEqual(left, right);
+                //    break;
+                case QueryTypeEnum.GreaterThan:
+                    filter = Expression.GreaterThan(left, right);
+                    break;
+                case QueryTypeEnum.GreaterThanOrEqual:
+                    filter = Expression.GreaterThanOrEqual(left, right);
+                    break;
+                case QueryTypeEnum.LessThan:
+                    filter = Expression.LessThan(left, right);
+                    break;
+                case QueryTypeEnum.LessThanOrEqual:
+                    filter = Expression.LessThanOrEqual(left, right);
+                    break;
+                case QueryTypeEnum.Like:
+                    filter = Expression.Call(left, typeof(string).GetMethod("Contains"), right);
+                    break;
+                //case "NOT LIKE":
+                //    filter = Expression.Not(Expression.Call(left, typeof(string).GetMethod("Contains"), right));
+                //    break;
+                default:
+                    filter = Expression.Equal(left, right);
+                    break;
+            }
+
+            return filter;
+        }
+
         public static Task<PagedList<T>> ToPageData<T>(this IQueryable<T> source, PageInputBase input) where T : new()
         {
             return source.OrderBy(OrderBuilder<T>(input)).ToPagedListAsync(input.PageIndex, input.PageSize);
@@ -52,6 +125,14 @@ namespace Ewide.Core.Extension
         }
 
         #region DAPPER
+        public async static Task<PagedList> QueryPageDataDynamic(this IDapperRepository source, string baseSql, PageInputBase input, IEnumerable<string> equalsFields = null, IEnumerable<string> likeFields = null, IEnumerable<string> dateTimeRangeFields = null, IEnumerable<string> otherRangeFields = null, IDbTransaction transaction = null, int? commandTimeout = null, CommandType? commandType = null)
+        {
+            SearchJsonFitlerInfoGetService searchJsonFitlerInfoGetService = new SearchJsonFitlerInfoGetService(input, equalsFields, likeFields, dateTimeRangeFields, otherRangeFields);
+            var sql = searchJsonFitlerInfoGetService.GetWhereSql(baseSql);
+            var param = searchJsonFitlerInfoGetService.sqlParameters;
+            return await QueryPageData(source, sql, input, param, transaction, commandTimeout, commandType);
+        }
+
         public async static Task<PagedList> QueryPageData(this IDapperRepository source, string sql, PageInputBase input, object param = null, IDbTransaction transaction = null, int? commandTimeout = null, CommandType? commandType = null)
         {
             var count = await source.PageTotalCount(
@@ -76,7 +157,7 @@ namespace Ewide.Core.Extension
                 PageSize = input.PageSize,
                 Items = data,
                 TotalCount = count,
-                TotalPages = (int)Math.Ceiling((decimal)count / (decimal)input.PageSize)
+                TotalPages = input.PageSize.Equals(0) ? 1 : (int)Math.Ceiling((decimal)count / (decimal)input.PageSize)
             };
 
             return page;
@@ -106,7 +187,7 @@ namespace Ewide.Core.Extension
                 PageSize = input.PageSize,
                 Items = data,
                 TotalCount = count,
-                TotalPages = (int)Math.Ceiling((decimal)count / (decimal)input.PageSize)
+                TotalPages = input.PageSize.Equals(0) ? 1 : (int)Math.Ceiling((decimal)count / (decimal)input.PageSize)
             };
 
             return page;