修改

Net6Demo_Api.Business/BaseBusiness.cs

@@ -277,8 +277,7 @@ namespace Net6Demo_Api.Business
         }
 
         /// <summary>
-        /// 使用SQL语句按照条件更新
-        /// 注：生成的SQL类似于UPDATE [TABLE] SET [Name] = 'xxx' WHERE [Id] = 'Admin'
+        /// 使用SQL语句按照条件更新(指定字段)
         /// </summary>
         /// <param name="where">筛选条件</param>
         /// <param name="fieldvalues">字段值设置</param>
@@ -297,8 +296,7 @@ namespace Net6Demo_Api.Business
         }
 
         /// <summary>
-        /// 使用SQL语句按照条件更新
-        /// 注：生成的SQL类似于UPDATE [TABLE] SET [Name] = 'xxx' WHERE [Id] = 'Admin'
+        /// 使用SQL语句按照条件更新(指定字段)
         /// </summary>
         /// <param name="where">筛选条件</param>
         /// <param name="fieldvalues">字段值设置</param>
@@ -362,149 +360,40 @@ namespace Net6Demo_Api.Business
         }
 
         /// <summary>
-        /// 根据条件获取数量
-        /// </summary>
-        /// <returns></returns>
-        public int GetCount(Expression<Func<T, bool>> condition)
-        {
-            #region 启用缓存
-            if (IsCache)
-            {
-                var listCache = GetRedis().Result;
-                if (listCache != null)
-                {
-                    return listCache.AsQueryable().Where(condition).Count();
-                }
-            }
-            #endregion
-
-            return _db.GetIQueryable<T>().AsNoTracking().Where(condition).Count();
-        }
-
-        /// <summary>
-        /// 根据条件获取数量
-        /// </summary>
-        /// <returns></returns>
-        public async Task<int> GetCountAsync(Expression<Func<T, bool>> condition)
-        {
-            #region 启用缓存
-            if (IsCache)
-            {
-                var listCache =await GetRedis();
-                if (listCache != null)
-                {
-                    return listCache.AsQueryable().Where(condition).Count();
-                }
-            }
-            #endregion
-
-            return await _db.GetIQueryable<T>().AsNoTracking().Where(condition).CountAsync();
-        }
-
-        /// <summary>
-        /// 获取表的所有数据，当数据量很大时不要使用！
-        /// </summary>
-        /// <returns></returns>
-        public List<T> GetList()
-        {
-            #region 启用缓存
-            if (IsCache)
-            {
-                var listCache = GetRedis().Result;
-                if (listCache != null)
-                {
-                    return listCache;
-                }
-            }
-            #endregion
-            return _db.GetIQueryable<T>().AsNoTracking().ToList();
-        }
-
-        /// <summary>
-        /// 根据条件获取列表，当数据量很大时不要使用！
+        /// 分页获取数据
         /// </summary>
+        /// <param name="page">分页信息</param>
+        /// <param name="orderByString">排序</param>
         /// <param name="condition">条件</param>
         /// <returns></returns>
-        public List<T> GetList(Expression<Func<T, bool>> condition)
+        public async Task<ValueTuple<List<T>, int>> GetListPageAsync(PageInput page, string orderByString, Expression<Func<T, bool>> condition)
         {
-            #region 启用缓存
-            if (IsCache)
-            {
-                var listCache = GetRedis().Result;
-                if (listCache != null)
-                {
-                    return listCache.AsQueryable().Where(condition).ToList();
-                }
-            }
-            #endregion
+            var iq = GetIQueryable().Where(condition);
+            var list = await iq.OrderBy(orderByString).Skip((page.PageIndex - 1) * page.PageRows).Take(page.PageRows).ToListAsync();
+            int total = await iq.CountAsync();
 
-            return _db.GetIQueryable<T>().AsNoTracking().Where(condition).ToList();
+            return (list, total);
         }
 
         /// <summary>
-        /// 获取表的所有数据，当数据量很大时不要使用！
+        /// 获取实体对应的表，延迟加载，主要用于支持Linq查询操作
         /// </summary>
+        /// <param name="IsNoCache">默认false，需要关联表查询时用true</param>
         /// <returns></returns>
-        public async Task<List<T>> GetListAsync()
+        public IQueryable<T> GetIQueryable(bool IsNoCache = false)
         {
             #region 启用缓存
-            if (IsCache)
+            if (IsCache && !IsNoCache)
             {
-                var listCache = await GetRedis();
-                if (listCache != null)
-                {
-                    return listCache;
-                }
-            }
-            #endregion
-            return await _db.GetIQueryable<T>().AsNoTracking().ToListAsync();
-        }
-
-        /// <summary>
-        /// 根据条件获取列表，当数据量很大时不要使用！
-        /// </summary>
-        /// <param name="condition">条件</param>
-        /// <returns></returns>
-        public async Task<List<T>> GetListAsync(Expression<Func<T, bool>> condition)
-        {
-            #region 启用缓存
-            if (IsCache)
-            {
-                var listCache = await GetRedis();
+                var listCache = GetRedis().Result;
                 if (listCache != null)
                 {
-                    return listCache.AsQueryable().Where(condition).ToList();
+                    return listCache.AsQueryable();
                 }
             }
             #endregion
 
-            return await _db.GetIQueryable<T>().AsNoTracking().Where(condition).ToListAsync();
-        }
-
-        /// <summary>
-        /// 分页获取数据
-        /// </summary>
-        /// <param name="page">分页信息</param>
-        /// <param name="orderByString">排序</param>
-        /// <param name="condition">条件</param>
-        /// <returns></returns>
-        public async Task<ValueTuple<List<T>, int>> GetListPageAsync(PageInput page, string orderByString, Expression<Func<T, bool>> condition)
-        {
-            var iq = _db.GetIQueryable<T>().AsNoTracking().Where(condition).OrderBy(orderByString);
-
-            var list = await iq.Skip((page.PageIndex - 1) * page.PageRows).Take(page.PageRows).ToListAsync();
-            int total = await iq.CountAsync();
-
-            return (list, total);
-        }
-
-        /// <summary>
-        /// 获取实体对应的表，延迟加载，主要用于支持Linq查询操作
-        /// </summary>
-        /// <returns></returns>
-        public virtual IQueryable<T> GetIQueryable()
-        {
-            return _db.GetIQueryable<T>();
+            return _db.GetIQueryable<T>().AsNoTracking();
         }
 
         #endregion

Net6Demo_Api.IBusiness/IBaseBusiness.cs

@@ -168,46 +168,6 @@ namespace Net6Demo_Api.IBusiness
         Task<T> GetEntityAsync(params object[] keyValue);
 
         /// <summary>
-        /// 根据条件获取数量
-        /// </summary>
-        /// <param name="condition">条件</param>
-        /// <returns></returns>
-        int GetCount(Expression<Func<T, bool>> condition);
-
-        /// <summary>
-        /// 根据条件获取数量
-        /// </summary>
-        /// <param name="condition">条件</param>
-        /// <returns></returns>
-        Task<int> GetCountAsync(Expression<Func<T, bool>> condition);
-
-        /// <summary>
-        /// 获取表的所有数据，当数据量很大时不要使用！
-        /// </summary>
-        /// <returns></returns>
-        List<T> GetList();
-
-        /// <summary>
-        /// 根据条件获取列表，当数据量很大时不要使用！
-        /// </summary>
-        /// <param name="condition">条件</param>
-        /// <returns></returns>
-        List<T> GetList(Expression<Func<T, bool>> condition);
-
-        /// <summary>
-        /// 获取表的所有数据，当数据量很大时不要使用！
-        /// </summary>
-        /// <returns></returns>
-        Task<List<T>> GetListAsync();
-
-        /// <summary>
-        /// 根据条件获取列表，当数据量很大时不要使用！
-        /// </summary>
-        /// <param name="condition">条件</param>
-        /// <returns></returns>
-        Task<List<T>> GetListAsync(Expression<Func<T, bool>> condition);
-
-        /// <summary>
         /// 分页获取数据
         /// </summary>
         /// <param name="page">分页信息</param>
@@ -216,6 +176,13 @@ namespace Net6Demo_Api.IBusiness
         /// <returns></returns>
         Task<ValueTuple<List<T>, int>> GetListPageAsync(PageInput page, string orderByString, Expression<Func<T, bool>> condition);
 
+        /// <summary>
+        /// 获取实体对应的表，延迟加载，主要用于支持Linq查询操作
+        /// </summary>
+        /// <param name="IsNoCache">默认false，需要关联表查询时用true</param>
+        /// <returns></returns>
+        IQueryable<T> GetIQueryable(bool IsNoCache = false);
+
         #endregion
 
         #region 执行Sql语句

Net6Demo_Api/Controllers/HomeController.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
 using Net6Demo_Api.Entity;
 using Net6Demo_Api.IBusiness;
@@ -20,12 +21,14 @@ namespace Net6Demo_Api.Controllers
         private readonly IConfiguration _config;
         private readonly IUserAccountBusiness _userBus;
         private readonly HttpHelper _httpHelper;
+        private readonly IWebHostEnvironment _env;
         private readonly ILogger _logger;
-        public HomeController(IUserAccountBusiness userBus, IConfiguration config, HttpHelper httpHelper, ILogger<HomeController> logger)
+        public HomeController(IUserAccountBusiness userBus, IConfiguration config, HttpHelper httpHelper, IWebHostEnvironment env,ILogger<HomeController> logger)
         {
             _userBus = userBus;
             _config = config;
             _httpHelper = httpHelper;
+            _env = env;
             _logger = logger;
         }
 
@@ -38,7 +41,7 @@ namespace Net6Demo_Api.Controllers
         public ActionResult Info()
         {
             _logger.LogInformation("HelloWord");
-            return Success("HelloWord");
+            return Success("HelloWord", _env.EnvironmentName);
         }
 
         /// <summary>
@@ -90,7 +93,7 @@ namespace Net6Demo_Api.Controllers
         [HttpPost]
         public async Task<ActionResult> SubmitLogin(LoginInput input)
         {
-            var user = (await _userBus.GetListAsync(p => p.F_UserCode == input.usercode && p.F_Password == input.password.ToMD5String())).FirstOrDefault();
+            var user = await _userBus.GetIQueryable().Where(p => p.F_UserCode == input.usercode && p.F_Password == input.password.ToMD5String()).FirstOrDefaultAsync();
 
             if (user == null)
             {
@@ -119,7 +122,7 @@ namespace Net6Demo_Api.Controllers
                 _config["JwtOptions:Issuser"],
                 _config["JwtOptions:Audience"],
                 claims,
-                expires: DateTime.Now.AddHours(Int32.Parse( _config["JwtOptions:AccessExpireHours"])),
+                expires: DateTime.Now.AddHours(int.Parse( _config["JwtOptions:AccessExpireHours"])),
                 signingCredentials: credentials);
 
             return Success("登录成功", new JwtSecurityTokenHandler().WriteToken(jwtToken));

Net6Demo_Api/Controllers/IndexController.cs

@@ -1,6 +1,7 @@
 using AutoMapper;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Net6Demo_Api.Entity;
 using Net6Demo_Api.IBusiness;
 
@@ -39,8 +40,8 @@ namespace Net6Demo_Api.Controllers
         [HttpGet]
         public async Task<ActionResult> GetMenu()
         {
-            var mids= (await _roleMenuBus.GetListAsync(p=>p.F_RoleId== CurrentUser.RoleId)).Select(p=>p.F_MenuId).ToList();
-            var menus = _mapper.Map<List<MenuTreeView>>((await _menuBus.GetListAsync(p => mids.Contains(p.F_MenuId) && p.F_State == 1)).ToList());
+            var mids = await _roleMenuBus.GetIQueryable().Where(p => p.F_RoleId == CurrentUser.RoleId).Select(p => p.F_MenuId).ToListAsync();
+            var menus = _mapper.Map<List<MenuTreeView>>(await _menuBus.GetIQueryable().Where(p => mids.Contains(p.F_MenuId) && p.F_State == 1).ToListAsync());
             return Success("成功", GetTreeList(menus));
 
             List<MenuTreeView> GetTreeList(List<MenuTreeView> list, int parentId = 0)

Net6Demo_Api/Controllers/System/CustomFiledController.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using Net6Demo_Api.Entity;
 using Net6Demo_Api.IBusiness;
 
@@ -26,7 +27,7 @@ namespace Net6Demo_Api.Controllers
         [HttpGet]
         public async Task<ActionResult> GetData(string tableid)
         {
-            var data = (await _configBus.GetListAsync(p => p.F_TableId == tableid && p.F_CreateUser == CurrentUser.UserCode)).FirstOrDefault();
+            var data = await _configBus.GetIQueryable().Where(p => p.F_TableId == tableid && p.F_CreateUser == CurrentUser.UserCode).FirstOrDefaultAsync();
             if (data != null)
             {
                 return Success("成功", _mapper.Map<CustomFiledView>(data));
@@ -45,7 +46,7 @@ namespace Net6Demo_Api.Controllers
         public async Task<ActionResult> SaveData(CustomFiledAddEditInput input)
         {
             int result = 0;
-            var oldData = (await _configBus.GetListAsync(p => p.F_TableId == input.TableId && p.F_CreateUser == CurrentUser.UserCode)).FirstOrDefault();
+            var oldData = await _configBus.GetIQueryable().Where(p => p.F_TableId == input.TableId && p.F_CreateUser == CurrentUser.UserCode).FirstOrDefaultAsync();
             if (oldData != null)
             {
                 _mapper.Map(input, oldData);

Net6Demo_Api/Controllers/System/DepartmentController.cs

@@ -58,7 +58,7 @@ namespace Net6Demo_Api.Controllers
         [HttpGet]
         public async Task<ActionResult> GetTreeList()
         {
-            var depts = _mapper.Map<List<DepartmentTreeView>>((await _deptBus.GetListAsync(p => p.F_State == 1)).ToList());
+            var depts = _mapper.Map<List<DepartmentTreeView>>(await _deptBus.GetIQueryable().Where(p => p.F_State == 1).ToListAsync());
             return Success("成功", GetTreeList(depts));
 
             List<DepartmentTreeView> GetTreeList(List<DepartmentTreeView> list, int parentId = 0)

Net6Demo_Api/Controllers/System/RoleController.cs

@@ -46,8 +46,7 @@ namespace Net6Demo_Api.Controllers
                 q = q.And(x => EF.Functions.Like(x.F_RoleName, "%" + search.name + "%"));
             }
 
-            var data = await _roleBus.GetListPageAsync(input, " F_RoleId desc", q);
-
+            var data = await _roleBus.GetListPageAsync(input, " F_Id desc", q);
             return Success("成功", _mapper.Map<List<RoleView>>(data.Item1), data.Item2);
         }
         /// <summary>
@@ -156,8 +155,8 @@ namespace Net6Demo_Api.Controllers
         [HttpGet]
         public async Task<ActionResult> GetRoleMenu(int roleid)
         {
-            var rolemenuids = (await _roleMenuBus.GetListAsync(p => p.F_RoleId == roleid)).Select(p => p.F_MenuId).ToList();
-            var menus = await _menuBus.GetListAsync(p => p.F_State == 1);
+            var rolemenuids = await _roleMenuBus.GetIQueryable().Where(p => p.F_RoleId == roleid).Select(p => p.F_MenuId).ToListAsync();
+            var menus = await _menuBus.GetIQueryable().Where(p => p.F_State == 1).ToListAsync();
             var result = menus.Select(x => new
             {
                 id = x.F_MenuId,

Net6Demo_Api/Controllers/System/UserAccountController.cs

@@ -80,7 +80,7 @@ namespace Net6Demo_Api.Controllers
                 q = q.And(x => EF.Functions.Like(x.F_UserName, "%" + input.username + "%"));
             }
 
-            var result = await _userBus.GetListAsync(q);
+            var result = await _userBus.GetIQueryable().Where(q).ToListAsync();
             return Success("成功", _mapper.Map<List<UserAccountView>>(result));
         }
         /// <summary>

Net6Demo_Api/Filters/AuthorityFilter.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.EntityFrameworkCore;
 using Net6Demo_Api.Entity;
 using Net6Demo_Api.IBusiness;
 using Net6Demo_Api.Models;
@@ -63,16 +64,16 @@ namespace Net6Demo_Api.Filters
                             string usercode = cls.Where(x => x.Type == "UserCode").FirstOrDefault()?.Value??"";
                             string roleid = cls.Where(x => x.Type == "RoleId").FirstOrDefault()?.Value ?? "";
                             //判断用户存在和角色是否改变
-                            var user = (await _userBus.GetListAsync(p => p.F_UserCode == usercode && p.F_DeleteFlag == 0)).FirstOrDefault();
+                            var user = await _userBus.GetIQueryable().Where(p => p.F_UserCode == usercode && p.F_DeleteFlag == 0).FirstOrDefaultAsync(); 
                             if (user != null && user.F_RoleId.ToString() == roleid)
                             {
                                 //判断此请求是否需要授权
                                 var path = ad.RouteValues["controller"] + "/" + ad.RouteValues["action"];
-                                var mid = (await _menuBus.GetListAsync(p => p.F_State == 1 && p.F_Action == path)).FirstOrDefault()?.F_MenuId ?? 0;
+                                var mid = await _menuBus.GetIQueryable().Where(p => p.F_State == 1 && p.F_Action == path).Select(p => p.F_MenuId).FirstOrDefaultAsync();
                                 if (mid > 0)
                                 {
                                     //判断此角色是否有权限
-                                    var ishas = (await _roleMenuBus.GetCountAsync(p => p.F_RoleId == user.F_RoleId && p.F_MenuId == mid)) > 0;
+                                    var ishas = await _roleMenuBus.ExistsAsync(p => p.F_RoleId == user.F_RoleId && p.F_MenuId == mid);
                                     if (!ishas)
                                     {
                                         context.Response.StatusCode = 200;

Net6Demo_Api/Properties/PublishProfiles/FolderProfile.pubxml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <DeleteExistingFiles>False</DeleteExistingFiles>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-  </PropertyGroup>
-</Project>